diff options
| author | Tom St Denis <tom.stdenis@amd.com> | 2016-03-02 14:58:07 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-08 17:01:51 +0100 |
| commit | 29f646dfb2269fa55d48a8d8c91a42ee64e5e4fc (patch) | |
| tree | a78c45bd19768b5b7ad53b09b9cd79ec4f546ad5 /drivers/gpu/drm/amd | |
| parent | drm/amdgpu: move get_user_pages out of amdgpu_ttm_tt_pin_userptr v6 (diff) | |
| download | linux-29f646dfb2269fa55d48a8d8c91a42ee64e5e4fc.tar.xz linux-29f646dfb2269fa55d48a8d8c91a42ee64e5e4fc.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 3 |
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 6e8d74da183f..4501ed0e97c7 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; |