diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-05-10 13:29:56 (GMT) |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-11 17:30:33 (GMT) |
| commit | 67b1fcc9ac3f05660809e14cf76a046fc1cc7e41 (patch) | |
| tree | d93b9dca50f1fe268e5a6894cdc59ec25ac55f70 | |
| parent | 758ac17f963f3497aae4e767d3a9eb68fea71f71 (diff) | |
| download | linux-67b1fcc9ac3f05660809e14cf76a046fc1cc7e41.tar.xz | |
drm/amdgpu/dce11: fix audio offset for asics with >7 audio pins
Missing offset in the audio offset array.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vid.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index b722aa0..1e09885 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -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) diff --git a/drivers/gpu/drm/amd/amdgpu/vid.h b/drivers/gpu/drm/amd/amdgpu/vid.h index 3bf7172..062ee16 100644 --- a/drivers/gpu/drm/amd/amdgpu/vid.h +++ b/drivers/gpu/drm/amd/amdgpu/vid.h @@ -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) |