]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amdgpu: remove redundant enable_mes and enable_mes_kiq
authorYifan Zhang <yifan1.zhang@amd.com>
Sun, 12 Jun 2022 04:12:34 +0000 (12:12 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 15 Jun 2022 01:38:41 +0000 (21:38 -0400)
enable_mes and enable_mes_kiq are set in both device init and
MES IP init. Leave the ones in MES IP init, since it is
a more accurate way to judge from GC IP version.

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jack Xiao <Jack.Xiao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 45dc96aee39ef929c7280bec4092582f9b7a1e44..ea9a9d781d8c40c9836b46003df30502c9971e53 100644 (file)
@@ -3615,14 +3615,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
        if (amdgpu_mcbp)
                DRM_INFO("MCBP is enabled\n");
 
-       if (adev->asic_type >= CHIP_NAVI10) {
-               if (amdgpu_mes || amdgpu_mes_kiq)
-                       adev->enable_mes = true;
-
-               if (amdgpu_mes_kiq)
-                       adev->enable_mes_kiq = true;
-       }
-
        /*
         * Reset domain needs to be present early, before XGMI hive discovered
         * (if any) and intitialized to use reset sem and in_gpu reset flag