drm/amdgpu: read hw register to check pg status.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

5 files changed, 10 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 96ad79627dbb..e9af03113fc3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1037,7 +1037,6 @@ struct amdgpu_uvd {
         bool                    use_ctx_buf;
         struct amd_sched_entity entity;
         uint32_t                srbm_soft_reset;
-        bool                    is_powergated;
 };
 
 /*
@@ -1066,7 +1065,6 @@ struct amdgpu_vce {
         struct amd_sched_entity entity;
         uint32_t                srbm_soft_reset;
         unsigned                num_rings;
-        bool                    is_powergated;
 };
 
 /*
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
index f15df99f0a06..97af4827f652 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
@@ -723,7 +723,8 @@ static int uvd_v4_2_set_powergating_state(void *handle,
         if (state == AMD_PG_STATE_GATE) {
                 uvd_v4_2_stop(adev);
                 if (adev->pg_flags & AMD_PG_SUPPORT_UVD && amdgpu_dpm == 0) {
-                        if (!(RREG32_SMC(ixCURRENT_PG_STATUS) & 0x4)) {
+                        if (!(RREG32_SMC(ixCURRENT_PG_STATUS) &
+                                CURRENT_PG_STATUS__UVD_PG_STATUS_MASK)) {
                                 WREG32(mmUVD_PGFSM_CONFIG, (UVD_PGFSM_CONFIG__UVD_PGFSM_FSM_ADDR_MASK   |
                                                         UVD_PGFSM_CONFIG__UVD_PGFSM_POWER_DOWN_MASK |
                                                         UVD_PGFSM_CONFIG__UVD_PGFSM_P1_SELECT_MASK));
@@ -733,7 +734,8 @@ static int uvd_v4_2_set_powergating_state(void *handle,
                 return 0;
         } else {
                 if (adev->pg_flags & AMD_PG_SUPPORT_UVD && amdgpu_dpm == 0) {
-                        if (RREG32_SMC(ixCURRENT_PG_STATUS) & 0x4) {
+                        if (RREG32_SMC(ixCURRENT_PG_STATUS) &
+                                CURRENT_PG_STATUS__UVD_PG_STATUS_MASK) {
                                 WREG32(mmUVD_PGFSM_CONFIG, (UVD_PGFSM_CONFIG__UVD_PGFSM_FSM_ADDR_MASK   |
                                                 UVD_PGFSM_CONFIG__UVD_PGFSM_POWER_UP_MASK |
                                                 UVD_PGFSM_CONFIG__UVD_PGFSM_P1_SELECT_MASK));
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
index 46e715193924..ad8c02e423d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
@@ -825,12 +825,10 @@ static int uvd_v5_0_set_powergating_state(void *handle,
 
         if (state == AMD_PG_STATE_GATE) {
                 uvd_v5_0_stop(adev);
-                adev->uvd.is_powergated = true;
         } else {
                 ret = uvd_v5_0_start(adev);
                 if (ret)
                         goto out;
-                adev->uvd.is_powergated = false;
         }
 
 out:
@@ -844,7 +842,8 @@ static void uvd_v5_0_get_clockgating_state(void *handle, u32 *flags)
 
         mutex_lock(&adev->pm.mutex);
 
-        if (adev->uvd.is_powergated) {
+        if (RREG32_SMC(ixCURRENT_PG_STATUS) &
+                                CURRENT_PG_STATUS__UVD_PG_STATUS_MASK) {
                 DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
                 goto out;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index af83ab8c1250..18a6de4e1512 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -1051,12 +1051,10 @@ static int uvd_v6_0_set_powergating_state(void *handle,
 
         if (state == AMD_PG_STATE_GATE) {
                 uvd_v6_0_stop(adev);
-                adev->uvd.is_powergated = true;
         } else {
                 ret = uvd_v6_0_start(adev);
                 if (ret)
                         goto out;
-                adev->uvd.is_powergated = false;
         }
 
 out:
@@ -1070,7 +1068,8 @@ static void uvd_v6_0_get_clockgating_state(void *handle, u32 *flags)
 
         mutex_lock(&adev->pm.mutex);
 
-        if (adev->uvd.is_powergated) {
+        if (RREG32_SMC(ixCURRENT_PG_STATUS) &
+                                CURRENT_PG_STATUS__UVD_PG_STATUS_MASK) {
                 DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
                 goto out;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index a78298529f07..93ec8815bb13 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -768,12 +768,10 @@ static int vce_v3_0_set_powergating_state(void *handle,
                 ret = vce_v3_0_stop(adev);
                 if (ret)
                         goto out;
-                adev->vce.is_powergated = true;
         } else {
                 ret = vce_v3_0_start(adev);
                 if (ret)
                         goto out;
-                adev->vce.is_powergated = false;
         }
 
 out:
@@ -787,7 +785,8 @@ static void vce_v3_0_get_clockgating_state(void *handle, u32 *flags)
 
         mutex_lock(&adev->pm.mutex);
 
-        if (adev->vce.is_powergated) {
+        if (RREG32_SMC(ixCURRENT_PG_STATUS) &
+                        CURRENT_PG_STATUS__VCE_PG_STATUS_MASK) {
                 DRM_INFO("Cannot get clockgating state when VCE is powergated.\n");
                 goto out;
         }