aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/evergreen_hdmi.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2013-04-13 19:26:24 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-04-22 10:39:14 -0400
commitf93e3fc37e1e9959a4f3102f075bfb180ce8a72f (patch)
tree88531b959fb4df1e48d040786fbf40c9d9e7d1a7 /drivers/gpu/drm/radeon/evergreen_hdmi.c
parent91a440190c8414d7ef2d6a39d7185858a6ebc83c (diff)
drm/radeon/evergreen: write default channel numbers
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_hdmi.c')
-rw-r--r--drivers/gpu/drm/radeon/evergreen_hdmi.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index b1e5e60d23a8..380933bc1782 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -143,6 +143,27 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
143 143
144 evergreen_hdmi_update_ACR(encoder, mode->clock); 144 evergreen_hdmi_update_ACR(encoder, mode->clock);
145 145
146 WREG32(AFMT_60958_0 + offset,
147 AFMT_60958_CS_CHANNEL_NUMBER_L(1));
148
149 WREG32(AFMT_60958_1 + offset,
150 AFMT_60958_CS_CHANNEL_NUMBER_R(2));
151
152 WREG32(AFMT_60958_2 + offset,
153 AFMT_60958_CS_CHANNEL_NUMBER_2(3) |
154 AFMT_60958_CS_CHANNEL_NUMBER_3(4) |
155 AFMT_60958_CS_CHANNEL_NUMBER_4(5) |
156 AFMT_60958_CS_CHANNEL_NUMBER_5(6) |
157 AFMT_60958_CS_CHANNEL_NUMBER_6(7) |
158 AFMT_60958_CS_CHANNEL_NUMBER_7(8));
159
160 /* fglrx sets 0x0001005f | (x & 0x00fc0000) in 0x5f78 here */
161
162 WREG32(AFMT_AUDIO_PACKET_CONTROL2 + offset,
163 AFMT_AUDIO_CHANNEL_ENABLE(0xff));
164
165 /* fglrx sets 0x40 in 0x5f80 here */
166
146 err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); 167 err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
147 if (err < 0) { 168 if (err < 0) {
148 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); 169 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);