aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0364-drm-amd-amdgpu-Don-t-proceed-in-audio_fini-in-DCEv11.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0364-drm-amd-amdgpu-Don-t-proceed-in-audio_fini-in-DCEv11.patch')
-rw-r--r--common/recipes-kernel/linux/files/0364-drm-amd-amdgpu-Don-t-proceed-in-audio_fini-in-DCEv11.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0364-drm-amd-amdgpu-Don-t-proceed-in-audio_fini-in-DCEv11.patch b/common/recipes-kernel/linux/files/0364-drm-amd-amdgpu-Don-t-proceed-in-audio_fini-in-DCEv11.patch
new file mode 100644
index 00000000..158a7494
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0364-drm-amd-amdgpu-Don-t-proceed-in-audio_fini-in-DCEv11.patch
@@ -0,0 +1,33 @@
+From de73a4e5e473d93bbfe7ffe94af997e79035a800 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Wed, 2 Mar 2016 08:58:07 -0500
+Subject: [PATCH 0364/1110] drm/amd/amdgpu: Don't proceed in audio_fini in
+ DCEv11 if disabled
+
+If amdgpu_audio is disabled then the audio structure is not initialized
+so we shouldn't read it in the fini function.
+
+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_v11_0.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+index 41e94d4..9c1d120 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+@@ -1658,6 +1658,9 @@ static void dce_v11_0_audio_fini(struct amdgpu_device *adev)
+ {
+ int i;
+
++ if (!amdgpu_audio)
++ return;
++
+ if (!adev->mode_info.audio.enabled)
+ return;
+
+--
+2.7.4
+