summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2016-03-02 08:58:07 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:51 -0500
commit29f646dfb2269fa55d48a8d8c91a42ee64e5e4fc (patch)
treea78c45bd19768b5b7ad53b09b9cd79ec4f546ad5
parent2f568dbd6b944c2e8c0c54b53c2211c23995e6a4 (diff)
downloadop-kernel-dev-29f646dfb2269fa55d48a8d8c91a42ee64e5e4fc.zip
op-kernel-dev-29f646dfb2269fa55d48a8d8c91a42ee64e5e4fc.tar.gz
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v11_0.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 6e8d74d..4501ed0 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;
OpenPOWER on IntegriCloud