]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/amdgpu/dce11: fix audio offset for asics with >7 audio pins
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 10 May 2016 13:29:56 +0000 (09:29 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 11 May 2016 17:30:33 +0000 (13:30 -0400)
Missing offset in the audio offset array.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/amd/amdgpu/vid.h

index b722aa0554926a724fcc2cbf9ea9394ad6e7cea3..1e0988572a2fb388d0dd18f76597bc944a69d861 100644 (file)
@@ -1602,6 +1602,7 @@ static const u32 pin_offsets[] =
        AUD4_REGISTER_OFFSET,
        AUD5_REGISTER_OFFSET,
        AUD6_REGISTER_OFFSET,
+       AUD7_REGISTER_OFFSET,
 };
 
 static int dce_v11_0_audio_init(struct amdgpu_device *adev)
index 3bf7172ede43cd19d09c215771920b3aa43dc730..062ee16764800908aca8003b7a0cda6631da212a 100644 (file)
@@ -54,7 +54,8 @@
 #define AUD3_REGISTER_OFFSET                 (0x17b4 - 0x17a8)
 #define AUD4_REGISTER_OFFSET                 (0x17b8 - 0x17a8)
 #define AUD5_REGISTER_OFFSET                 (0x17bc - 0x17a8)
-#define AUD6_REGISTER_OFFSET                 (0x17c4 - 0x17a8)
+#define AUD6_REGISTER_OFFSET                 (0x17c0 - 0x17a8)
+#define AUD7_REGISTER_OFFSET                 (0x17c4 - 0x17a8)
 
 /* hpd instance offsets */
 #define HPD0_REGISTER_OFFSET                 (0x1898 - 0x1898)