drm/amdgpu: switch default mes to uni mes

Switch the default mes to uni mes for gfx v12.
V2: remove uni_mes set for gfx v11.

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Jack Xiao <Jack.Xiao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 7446b351895f49968386952199606ef8358d3a72..cfcd21a19b59de75ea23f5aebe053f1e583b743c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2336,8 +2336,6 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)
                amdgpu_device_ip_block_add(adev, &mes_v11_0_ip_block);
                adev->enable_mes = true;
                adev->enable_mes_kiq = true;
-               if (amdgpu_uni_mes)
-                       adev->enable_uni_mes = true;
                break;
        case IP_VERSION(12, 0, 0):
        case IP_VERSION(12, 0, 1):

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 1c4a444ee7d6afc8787185c1f3afd853d75ee7e3..f43bbc13fe40d3cce513ea04a9a297c69687fd2b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -198,7 +198,7 @@ int amdgpu_discovery = -1;
 int amdgpu_mes;
 int amdgpu_mes_log_enable = 0;
 int amdgpu_mes_kiq;
-int amdgpu_uni_mes;
+int amdgpu_uni_mes = 1;
 int amdgpu_noretry = -1;
 int amdgpu_force_asic_type = -1;
 int amdgpu_tmz = -1; /* auto */
@@ -695,7 +695,7 @@ module_param_named(mes_kiq, amdgpu_mes_kiq, int, 0444);
  * (0 = disabled (default), 1 = enabled)
  */
 MODULE_PARM_DESC(uni_mes,
-       "Enable Unified Micro Engine Scheduler (0 = disabled (default), 1 = enabled)");
+       "Enable Unified Micro Engine Scheduler (0 = disabled, 1 = enabled(default)");
 module_param_named(uni_mes, amdgpu_uni_mes, int, 0444);
 
 /**