From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 12 Feb 2020 15:49:45 +0000 (+0100)
Subject: radv: remove unnecessary RADV_DEBUG=nobatchchain option
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=886acbe1c535f0c564dbebdcdbcad38a5fef6c7d;p=mesa.git

radv: remove unnecessary RADV_DEBUG=nobatchchain option

It was used in the past but nowadays chained submissions work fine.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3791>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3791>
---

diff --git a/docs/envvars.html b/docs/envvars.html
index 906e1ee25a3..9938bc31fd0 100644
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -628,8 +628,6 @@ Mesa EGL supports different sets of environment variables.  See the
    <dd>enable wave32 for vertex/tess/geometry shaders (GFX10+)</dd>
    <dt><code>localbos</code></dt>
    <dd>enable local BOs</dd>
-   <dt><code>nobatchchain</code></dt>
-   <dd>disable chained submissions</dd>
    <dt><code>pswave32</code></dt>
    <dd>enable wave32 for pixel shaders (GFX10+)</dd>
    <dt><code>shader_ballot</code></dt>
diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 97bd0deb7fe..f7001adcee2 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -60,17 +60,16 @@ enum {
 };
 
 enum {
-	RADV_PERFTEST_NO_BATCHCHAIN   =    0x1,
-	RADV_PERFTEST_LOCAL_BOS       =    0x2,
-	RADV_PERFTEST_DCC_MSAA        =    0x4,
-	RADV_PERFTEST_BO_LIST         =    0x8,
-	RADV_PERFTEST_SHADER_BALLOT   =   0x10,
-	RADV_PERFTEST_TC_COMPAT_CMASK =   0x20,
-	RADV_PERFTEST_CS_WAVE_32      =   0x40,
-	RADV_PERFTEST_PS_WAVE_32      =   0x80,
-	RADV_PERFTEST_GE_WAVE_32      =  0x100,
-	RADV_PERFTEST_DFSM            =  0x200,
-	RADV_PERFTEST_ACO             =  0x400,
+	RADV_PERFTEST_LOCAL_BOS       =    0x1,
+	RADV_PERFTEST_DCC_MSAA        =    0x2,
+	RADV_PERFTEST_BO_LIST         =    0x4,
+	RADV_PERFTEST_SHADER_BALLOT   =    0x8,
+	RADV_PERFTEST_TC_COMPAT_CMASK =   0x10,
+	RADV_PERFTEST_CS_WAVE_32      =   0x20,
+	RADV_PERFTEST_PS_WAVE_32      =   0x40,
+	RADV_PERFTEST_GE_WAVE_32      =   0x80,
+	RADV_PERFTEST_DFSM            =  0x100,
+	RADV_PERFTEST_ACO             =  0x200,
 };
 
 bool
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 40742543e05..3aa22b0c67c 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -572,7 +572,6 @@ radv_get_debug_option_name(int id)
 }
 
 static const struct debug_control radv_perftest_options[] = {
-	{"nobatchchain", RADV_PERFTEST_NO_BATCHCHAIN},
 	{"localbos", RADV_PERFTEST_LOCAL_BOS},
 	{"dccmsaa", RADV_PERFTEST_DCC_MSAA},
 	{"bolist", RADV_PERFTEST_BO_LIST},
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index 4e29716b920..c6c9de93777 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -1242,7 +1242,7 @@ static int radv_amdgpu_winsys_cs_submit(struct radeon_winsys_ctx *_ctx,
 	if (!cs->ws->use_ib_bos) {
 		ret = radv_amdgpu_winsys_cs_submit_sysmem(_ctx, queue_idx, sem_info, bo_list, cs_array,
 							   cs_count, initial_preamble_cs, continue_preamble_cs, _fence);
-	} else if (can_patch && cs->ws->batchchain) {
+	} else if (can_patch) {
 		ret = radv_amdgpu_winsys_cs_submit_chained(_ctx, queue_idx, sem_info, bo_list, cs_array,
 							    cs_count, initial_preamble_cs, continue_preamble_cs, _fence);
 	} else {
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index 4310009ddb0..bac68e9f7fc 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -190,7 +190,6 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags)
 	ws->use_local_bos = perftest_flags & RADV_PERFTEST_LOCAL_BOS;
 	ws->zero_all_vram_allocs = debug_flags & RADV_DEBUG_ZERO_VRAM;
 	ws->noop = debug_flags & RADV_DEBUG_NOOP;
-	ws->batchchain = !(perftest_flags & RADV_PERFTEST_NO_BATCHCHAIN);
 	list_inithead(&ws->global_bo_list);
 	pthread_mutex_init(&ws->global_bo_list_lock, NULL);
 	ws->base.query_info = radv_amdgpu_winsys_query_info;
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
index ca16c48a791..1178600384d 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -44,7 +44,6 @@ struct radv_amdgpu_winsys {
 	ADDR_HANDLE addrlib;
 
 	bool debug_all_bos;
-	bool batchchain;
 	bool use_ib_bos;
 	bool zero_all_vram_allocs;
 	bool use_local_bos;