drm/amdgpu: add get clockgating_state method for uvd v5&v6
Subsystems (2)
PATCH v5 7/8 drm/amdgpu: add get clockgating_state method for uvd v5&v6
---
Changes from V4 -> V5:
- remove pm mutex from set clock gating function
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 33 +++++++++++++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1183,6 +1183,7 @@ struct amdgpu_uvd {bool use_ctx_buf;struct amd_sched_entity entity;uint32_t srbm_soft_reset; +bool is_powergated; };/*
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +31 -2
@@ -781,16 +781,44 @@ static int uvd_v5_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_UVD ))return 0 ;if (state ==AMD_PG_STATE_GATE ) {uvd_v5_0_stop (adev); -return 0 ; + adev->uvd.is_powergated = true; }else { -return uvd_v5_0_start (adev); + ret =uvd_v5_0_start (adev); +if (ret) + goto out; + adev->uvd.is_powergated = false; + } + +out: +return ret; +} + +static void uvd_v5_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->uvd.is_powergated) { +DRM_INFO ("Cannot get clockgating state when UVD is powergated.\n" ); + goto out; } + +/* AMD_CG_SUPPORT_UVD_MGCG */ + data =RREG32 (mmUVD_CGC_CTRL); +if (data &UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ) + *flags |=AMD_CG_SUPPORT_UVD_MGCG ; + +out: +mutex_unlock (&adev->pm.mutex); }static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
@@ -808,6 +836,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = { .soft_reset = uvd_v5_0_soft_reset, .set_clockgating_state = uvd_v5_0_set_clockgating_state, .set_powergating_state = uvd_v5_0_set_powergating_state, + .get_clockgating_state = uvd_v5_0_get_clockgating_state, };static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +31 -2
@@ -987,6 +987,7 @@ static int uvd_v6_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_UVD ))return 0 ;
@@ -995,10 +996,37 @@ static int uvd_v6_0_set_powergating_state(void *handle,if (state ==AMD_PG_STATE_GATE ) {uvd_v6_0_stop (adev); -return 0 ; + adev->uvd.is_powergated = true; }else { -return uvd_v6_0_start (adev); + ret =uvd_v6_0_start (adev); +if (ret) + goto out; + adev->uvd.is_powergated = false; + } + +out: +return ret; +} + +static void uvd_v6_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->uvd.is_powergated) { +DRM_INFO ("Cannot get clockgating state when UVD is powergated.\n" ); + goto out; } + +/* AMD_CG_SUPPORT_UVD_MGCG */ + data =RREG32 (mmUVD_CGC_CTRL); +if (data &UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ) + *flags |=AMD_CG_SUPPORT_UVD_MGCG ; + +out: +mutex_unlock (&adev->pm.mutex); }static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
@@ -1019,6 +1047,7 @@ static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { .post_soft_reset = uvd_v6_0_post_soft_reset, .set_clockgating_state = uvd_v6_0_set_clockgating_state, .set_powergating_state = uvd_v6_0_set_powergating_state, + .get_clockgating_state = uvd_v6_0_get_clockgating_state, };static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1483977889-16256-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH v5 8/8 drm/amdgpu: add get clockgating_state method for vce v3
---
Changes from V4 -> V5:
- Remove pm mutex from set clock gating function.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 40 +++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1212,6 +1212,7 @@ struct amdgpu_vce {struct amd_sched_entity entity;uint32_t srbm_soft_reset;unsigned num_rings; +bool is_powergated; };/*
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +36 -4
@@ -770,15 +770,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,
@@ -832,6 +863,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 = {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 09.01.2017 um 17:04 schrieb Huang Rui:
Quoted 1 line
Signed-off-by Huang Rui <[email protected]>
For this one and the VCE equivalent are Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.
Quoted 135 lines
---
Changes from V4 -> V5:
- remove pm mutex from set clock gating function--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 33 +++++++++++++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1183,6 +1183,7 @@ struct amdgpu_uvd {bool use_ctx_buf;struct amd_sched_entity entity;uint32_t srbm_soft_reset; +bool is_powergated; };/* drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +31
-2@@ -781,16 +781,44 @@ static int uvd_v5_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_UVD ))return 0 ;if (state ==AMD_PG_STATE_GATE ) {uvd_v5_0_stop (adev); -return 0 ; + adev->uvd.is_powergated = true; }else { -return uvd_v5_0_start (adev); + ret =uvd_v5_0_start (adev); +if (ret) + goto out; + adev->uvd.is_powergated = false; + } + +out: +return ret; +} + +static void uvd_v5_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->uvd.is_powergated) { +DRM_INFO ("Cannot get clockgating state when UVD is powergated.\n" ); + goto out; } + +/* AMD_CG_SUPPORT_UVD_MGCG */ + data =RREG32 (mmUVD_CGC_CTRL); +if (data &UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ) + *flags |=AMD_CG_SUPPORT_UVD_MGCG ; + +out: +mutex_unlock (&adev->pm.mutex); }static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {@@ -808,6 +836,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = { .soft_reset = uvd_v5_0_soft_reset, .set_clockgating_state = uvd_v5_0_set_clockgating_state, .set_powergating_state = uvd_v5_0_set_powergating_state, + .get_clockgating_state = uvd_v5_0_get_clockgating_state, };static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +30
-2@@ -987,6 +987,7 @@ static int uvd_v6_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_UVD ))return 0 ;@@ -995,10 +996,37 @@ static int uvd_v6_0_set_powergating_state(void *handle,if (state ==AMD_PG_STATE_GATE ) {uvd_v6_0_stop (adev); -return 0 ; + adev->uvd.is_powergated = true; }else { -return uvd_v6_0_start (adev); + ret =uvd_v6_0_start (adev); +if (ret) + goto out; + adev->uvd.is_powergated = false; + } + +out: +return ret; +} + +static void uvd_v6_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->uvd.is_powergated) { +DRM_INFO ("Cannot get clockgating state when UVD is powergated.\n" ); + goto out; } + +/* AMD_CG_SUPPORT_UVD_MGCG */ + data =RREG32 (mmUVD_CGC_CTRL); +if (data &UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ) + *flags |=AMD_CG_SUPPORT_UVD_MGCG ; + +out: +mutex_unlock (&adev->pm.mutex); }static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { · line 1053
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1
-0@@ -1019,6 +1047,7 @@ static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { .post_soft_reset = uvd_v6_0_post_soft_reset, .set_clockgating_state = uvd_v6_0_set_clockgating_state, .set_powergating_state = uvd_v6_0_set_powergating_state, + .get_clockgating_state = uvd_v6_0_get_clockgating_state, };static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx