diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2312-drm-amdgpu-vcn2-don-t-access-register-when-power-gat.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2312-drm-amdgpu-vcn2-don-t-access-register-when-power-gat.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2312-drm-amdgpu-vcn2-don-t-access-register-when-power-gat.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2312-drm-amdgpu-vcn2-don-t-access-register-when-power-gat.patch new file mode 100644 index 00000000..ebaa3a21 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2312-drm-amdgpu-vcn2-don-t-access-register-when-power-gat.patch @@ -0,0 +1,34 @@ +From a94368543d3a5d384985ededb131715bdfd7ab8a Mon Sep 17 00:00:00 2001 +From: Jack Xiao <Jack.Xiao@amd.com> +Date: Thu, 18 Apr 2019 17:37:14 +0800 +Subject: [PATCH 2312/2940] drm/amdgpu/vcn2: don't access register when power + gated + +It will cause bus hang to access register UVD_STATUS +when VCN is in the state of power gated. + +Signed-off-by: Jack Xiao <Jack.Xiao@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +index 7609e63e59bc..d1e90209d088 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +@@ -277,7 +277,8 @@ static int vcn_v2_0_hw_fini(void *handle) + struct amdgpu_ring *ring = &adev->vcn.ring_dec; + int i; + +- if (RREG32_SOC15(VCN, 0, mmUVD_STATUS)) ++ if (adev->vcn.cur_state != AMD_PG_STATE_GATE && ++ RREG32_SOC15(VCN, 0, mmUVD_STATUS)) + vcn_v2_0_set_powergating_state(adev, AMD_PG_STATE_GATE); + + ring->sched.ready = false; +-- +2.17.1 + |