aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0192-drm-amdgpu-handle-vce-pg-flags-properly.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0192-drm-amdgpu-handle-vce-pg-flags-properly.patch')
-rw-r--r--common/recipes-kernel/linux/files/0192-drm-amdgpu-handle-vce-pg-flags-properly.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0192-drm-amdgpu-handle-vce-pg-flags-properly.patch b/common/recipes-kernel/linux/files/0192-drm-amdgpu-handle-vce-pg-flags-properly.patch
new file mode 100644
index 00000000..98d54c67
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0192-drm-amdgpu-handle-vce-pg-flags-properly.patch
@@ -0,0 +1,45 @@
+From 93202d7b89cab4e2cdddf91b4f217786465fedd9 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 4 Feb 2016 23:29:45 -0500
+Subject: [PATCH 0192/1110] drm/amdgpu: handle vce pg flags properly
+
+Don't attempt to start/stop the vce block if pg is disabled.
+
+Reviewed-by: Eric Huang <JinHuiEric.Huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +++
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+index 52ac7a8..d3ce608 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+@@ -608,6 +608,9 @@ static int vce_v2_0_set_powergating_state(void *handle,
+ */
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
++ if (!(adev->pg_flags & AMDGPU_PG_SUPPORT_VCE))
++ return 0;
++
+ if (state == AMD_PG_STATE_GATE)
+ /* XXX do we need a vce_v2_0_stop()? */
+ return 0;
+diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+index e99af81..797d12c 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+@@ -728,6 +728,9 @@ static int vce_v3_0_set_powergating_state(void *handle,
+ */
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
++ if (!(adev->pg_flags & AMDGPU_PG_SUPPORT_VCE))
++ return 0;
++
+ if (state == AMD_PG_STATE_GATE)
+ /* XXX do we need a vce_v3_0_stop()? */
+ return 0;
+--
+2.7.4
+