OSDN Git Service

drm/amdgpu/vega20: enable the smu i2c bus for all boards
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 17 Jul 2020 13:33:54 +0000 (09:33 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 21 Jul 2020 19:37:53 +0000 (15:37 -0400)
There is no longer a ras dependency so it's safe to expose
on all boards.

Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c

index d1b7955..cf43629 100644 (file)
@@ -522,11 +522,9 @@ static int vega20_smu_init(struct pp_hwmgr *hwmgr)
        priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].version = 0x01;
        priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size = sizeof(DpmActivityMonitorCoeffInt_t);
 
-       if (adev->psp.ras.ras) {
-               ret = smu_v11_0_i2c_control_init(&adev->pm.smu_i2c);
-               if (ret)
-                       goto err4;
-       }
+       ret = smu_v11_0_i2c_control_init(&adev->pm.smu_i2c);
+       if (ret)
+               goto err4;
 
        return 0;
 
@@ -562,8 +560,7 @@ static int vega20_smu_fini(struct pp_hwmgr *hwmgr)
                        (struct vega20_smumgr *)(hwmgr->smu_backend);
        struct amdgpu_device *adev = hwmgr->adev;
 
-       if (adev->psp.ras.ras)
-               smu_v11_0_i2c_control_fini(&adev->pm.smu_i2c);
+       smu_v11_0_i2c_control_fini(&adev->pm.smu_i2c);
 
        if (priv) {
                amdgpu_bo_free_kernel(&priv->smu_tables.entry[TABLE_PPTABLE].handle,