summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2016-03-03 09:31:49 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:55 -0500
commit84cffef127cce662e73f5f887c590ac582dcc845 (patch)
tree7a51d6f04fed455ca483c797f69599661d0ba9a3
parent849dc32b20a496a45ad8d00fefd8ade37a272aba (diff)
downloadop-kernel-dev-84cffef127cce662e73f5f887c590ac582dcc845.zip
op-kernel-dev-84cffef127cce662e73f5f887c590ac582dcc845.tar.gz
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v8_0.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index b059853..ab536d3 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;
OpenPOWER on IntegriCloud