1 files changed, 47 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0194-drm-amdgpu-be-consistent-with-uvd-cg-flags.patch b/common/recipes-kernel/linux/files/0194-drm-amdgpu-be-consistent-with-uvd-cg-flags.patch
new file mode 100644
index 00000000..a88f30db
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0194-drm-amdgpu-be-consistent-with-uvd-cg-flags.patch
@@ -0,0 +1,47 @@
+From 1ff27cd3c7cac0e653851ae0b2dc55fff822f816 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 4 Feb 2016 23:33:56 -0500
+Subject: [PATCH 0194/1110] drm/amdgpu: be consistent with uvd cg flags
+
+Don't do anything if the uvd cg flags are not set.
+
+Reviewed-by: Eric Huang <JinHuiEric.Huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 3 +++
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+index 9cb5287..c982524 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+@@ -830,6 +830,9 @@ static int uvd_v4_2_set_clockgating_state(void *handle,
+ 	bool gate = false;
+ 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+ 
++	if (!(adev->cg_flags & AMDGPU_CG_SUPPORT_UVD_MGCG))
++		return 0;
++
+ 	if (state == AMD_CG_STATE_GATE)
+ 		gate = true;
+ 
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+index b4623de..aad1ab5 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+@@ -774,6 +774,11 @@ static int uvd_v5_0_process_interrupt(struct amdgpu_device *adev,
+ static int uvd_v5_0_set_clockgating_state(void *handle,
+ 					  enum amd_clockgating_state state)
+ {
++	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
++
++	if (!(adev->cg_flags & AMDGPU_CG_SUPPORT_UVD_MGCG))
++		return 0;
++
+ 	return 0;
+ }
+ 
+-- 
+2.7.4
+