drm/amdgpu: add get clockgating_state method for vce v3

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 5fa7c96dd30793b6c41192a20f768ac8944a7824..393f75f65d4c0d97c44233838de6ddab52687812 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1066,6 +1066,7 @@ 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/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 37ca685e5a9a9e358eaab6d32b9d5758fec90565..afec2e9d01bc0f25819685b3b33dda9d0bbda1f8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -777,15 +777,46 @@ static int vce_v3_0_set_powergating_state(void *handle,
         * the smc and the hw blocks
         */
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       int ret = 0;
 
        if (!(adev->pg_flags & AMD_PG_SUPPORT_VCE))
                return 0;
 
-       if (state == AMD_PG_STATE_GATE)
+       if (state == AMD_PG_STATE_GATE) {
+               adev->vce.is_powergated = true;
                /* XXX do we need a vce_v3_0_stop()? */
-               return 0;
-       else
-               return vce_v3_0_start(adev);
+       } else {
+               ret = vce_v3_0_start(adev);
+               if (ret)
+                       goto out;
+               adev->vce.is_powergated = false;
+       }
+
+out:
+       return ret;
+}
+
+static void vce_v3_0_get_clockgating_state(void *handle, u32 *flags)
+{
+       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       int data;
+
+       mutex_lock(&adev->pm.mutex);
+
+       if (adev->vce.is_powergated) {
+               DRM_INFO("Cannot get clockgating state when VCE is powergated.\n");
+               goto out;
+       }
+
+       WREG32_FIELD(GRBM_GFX_INDEX, VCE_INSTANCE, 0);
+
+       /* AMD_CG_SUPPORT_VCE_MGCG */
+       data = RREG32(mmVCE_CLOCK_GATING_A);
+       if (data & (0x04 << 4))
+               *flags |= AMD_CG_SUPPORT_VCE_MGCG;
+
+out:
+       mutex_unlock(&adev->pm.mutex);
 }
 
 static void vce_v3_0_ring_emit_ib(struct amdgpu_ring *ring,
@@ -839,6 +870,7 @@ static const struct amd_ip_funcs vce_v3_0_ip_funcs = {
        .post_soft_reset = vce_v3_0_post_soft_reset,
        .set_clockgating_state = vce_v3_0_set_clockgating_state,
        .set_powergating_state = vce_v3_0_set_powergating_state,
+       .get_clockgating_state = vce_v3_0_get_clockgating_state,
 };
 
 static const struct amdgpu_ring_funcs vce_v3_0_ring_phys_funcs = {