aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0373-drm-amd-amdgpu-Don-t-proceed-into-audio_fini-if-audi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0373-drm-amd-amdgpu-Don-t-proceed-into-audio_fini-if-audi.patch')
-rw-r--r--common/recipes-kernel/linux/files/0373-drm-amd-amdgpu-Don-t-proceed-into-audio_fini-if-audi.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0373-drm-amd-amdgpu-Don-t-proceed-into-audio_fini-if-audi.patch b/common/recipes-kernel/linux/files/0373-drm-amd-amdgpu-Don-t-proceed-into-audio_fini-if-audi.patch
new file mode 100644
index 00000000..c4deb613
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0373-drm-amd-amdgpu-Don-t-proceed-into-audio_fini-if-audi.patch
@@ -0,0 +1,30 @@
+From 9970daea15792f772e8339d703cd6713ced0e344 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Thu, 3 Mar 2016 09:31:49 -0500
+Subject: [PATCH 0373/1110] drm/amd/amdgpu: Don't proceed into audio_fini if
+ audio is disabled (DCEv8)
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+index a220711..4ce5f94 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+@@ -1639,6 +1639,9 @@ static void dce_v8_0_audio_fini(struct amdgpu_device *adev)
+ {
+ int i;
+
++ if (!amdgpu_audio)
++ return;
++
+ if (!adev->mode_info.audio.enabled)
+ return;
+
+--
+2.7.4
+