Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon/hdmi: use separated file for DCE 3.1/3.2 code

DCE 3.1 and 3.2 should be programmed in a different way than DCE 2 and
DCE 3. The order of setting registers and sets of registers are
different.
It's still unsure how we will handle DCE 3.1 vs. DCE 3.2, since they
have few differences as well.
For now separate DCE 2 and DCE 3 path, so we can work on it without a
risk of breaking DCE 3.1+.

This has been tested for possible regressions on DCE32 HD4550 (RV710).

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Rafał Miłecki and committed by
Alex Deucher
8f33a156 1c89d27f

+263 -141
+1 -1
drivers/gpu/drm/radeon/Makefile
··· 72 72 radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \ 73 73 rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ 74 74 r200.o radeon_legacy_tv.o r600_cs.o r600_blit_shaders.o \ 75 - radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ 75 + radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o dce3_1_afmt.o \ 76 76 evergreen.o evergreen_cs.o evergreen_blit_shaders.o \ 77 77 evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \ 78 78 atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \
+244
drivers/gpu/drm/radeon/dce3_1_afmt.c
··· 1 + /* 2 + * Copyright 2013 Advanced Micro Devices, Inc. 3 + * Copyright 2014 Rafał Miłecki 4 + * 5 + * Permission is hereby granted, free of charge, to any person obtaining a 6 + * copy of this software and associated documentation files (the "Software"), 7 + * to deal in the Software without restriction, including without limitation 8 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, 9 + * and/or sell copies of the Software, and to permit persons to whom the 10 + * Software is furnished to do so, subject to the following conditions: 11 + * 12 + * The above copyright notice and this permission notice shall be included in 13 + * all copies or substantial portions of the Software. 14 + * 15 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 16 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 18 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 19 + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 20 + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 21 + * OTHER DEALINGS IN THE SOFTWARE. 22 + */ 23 + #include <linux/hdmi.h> 24 + #include <drm/drmP.h> 25 + #include "radeon.h" 26 + #include "radeon_asic.h" 27 + #include "r600d.h" 28 + 29 + static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder) 30 + { 31 + struct radeon_device *rdev = encoder->dev->dev_private; 32 + struct drm_connector *connector; 33 + struct radeon_connector *radeon_connector = NULL; 34 + u32 tmp; 35 + u8 *sadb; 36 + int sad_count; 37 + 38 + list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { 39 + if (connector->encoder == encoder) { 40 + radeon_connector = to_radeon_connector(connector); 41 + break; 42 + } 43 + } 44 + 45 + if (!radeon_connector) { 46 + DRM_ERROR("Couldn't find encoder's connector\n"); 47 + return; 48 + } 49 + 50 + sad_count = drm_edid_to_speaker_allocation(radeon_connector->edid, &sadb); 51 + if (sad_count < 0) { 52 + DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count); 53 + return; 54 + } 55 + 56 + /* program the speaker allocation */ 57 + tmp = RREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER); 58 + tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK); 59 + /* set HDMI mode */ 60 + tmp |= HDMI_CONNECTION; 61 + if (sad_count) 62 + tmp |= SPEAKER_ALLOCATION(sadb[0]); 63 + else 64 + tmp |= SPEAKER_ALLOCATION(5); /* stereo */ 65 + WREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER, tmp); 66 + 67 + kfree(sadb); 68 + } 69 + 70 + static void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder) 71 + { 72 + struct radeon_device *rdev = encoder->dev->dev_private; 73 + struct drm_connector *connector; 74 + struct radeon_connector *radeon_connector = NULL; 75 + struct cea_sad *sads; 76 + int i, sad_count; 77 + 78 + static const u16 eld_reg_to_type[][2] = { 79 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR0, HDMI_AUDIO_CODING_TYPE_PCM }, 80 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR1, HDMI_AUDIO_CODING_TYPE_AC3 }, 81 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR2, HDMI_AUDIO_CODING_TYPE_MPEG1 }, 82 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR3, HDMI_AUDIO_CODING_TYPE_MP3 }, 83 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR4, HDMI_AUDIO_CODING_TYPE_MPEG2 }, 84 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR5, HDMI_AUDIO_CODING_TYPE_AAC_LC }, 85 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR6, HDMI_AUDIO_CODING_TYPE_DTS }, 86 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR7, HDMI_AUDIO_CODING_TYPE_ATRAC }, 87 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR9, HDMI_AUDIO_CODING_TYPE_EAC3 }, 88 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR10, HDMI_AUDIO_CODING_TYPE_DTS_HD }, 89 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR11, HDMI_AUDIO_CODING_TYPE_MLP }, 90 + { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR13, HDMI_AUDIO_CODING_TYPE_WMA_PRO }, 91 + }; 92 + 93 + list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { 94 + if (connector->encoder == encoder) { 95 + radeon_connector = to_radeon_connector(connector); 96 + break; 97 + } 98 + } 99 + 100 + if (!radeon_connector) { 101 + DRM_ERROR("Couldn't find encoder's connector\n"); 102 + return; 103 + } 104 + 105 + sad_count = drm_edid_to_sad(radeon_connector->edid, &sads); 106 + if (sad_count < 0) { 107 + DRM_ERROR("Couldn't read SADs: %d\n", sad_count); 108 + return; 109 + } 110 + BUG_ON(!sads); 111 + 112 + for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) { 113 + u32 value = 0; 114 + u8 stereo_freqs = 0; 115 + int max_channels = -1; 116 + int j; 117 + 118 + for (j = 0; j < sad_count; j++) { 119 + struct cea_sad *sad = &sads[j]; 120 + 121 + if (sad->format == eld_reg_to_type[i][1]) { 122 + if (sad->channels > max_channels) { 123 + value = MAX_CHANNELS(sad->channels) | 124 + DESCRIPTOR_BYTE_2(sad->byte2) | 125 + SUPPORTED_FREQUENCIES(sad->freq); 126 + max_channels = sad->channels; 127 + } 128 + 129 + if (sad->format == HDMI_AUDIO_CODING_TYPE_PCM) 130 + stereo_freqs |= sad->freq; 131 + else 132 + break; 133 + } 134 + } 135 + 136 + value |= SUPPORTED_FREQUENCIES_STEREO(stereo_freqs); 137 + 138 + WREG32(eld_reg_to_type[i][0], value); 139 + } 140 + 141 + kfree(sads); 142 + } 143 + 144 + /* 145 + * update the info frames with the data from the current display mode 146 + */ 147 + void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode) 148 + { 149 + struct drm_device *dev = encoder->dev; 150 + struct radeon_device *rdev = dev->dev_private; 151 + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); 152 + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; 153 + u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE]; 154 + struct hdmi_avi_infoframe frame; 155 + uint32_t offset; 156 + ssize_t err; 157 + 158 + if (!dig || !dig->afmt) 159 + return; 160 + 161 + /* Silent, r600_hdmi_enable will raise WARN for us */ 162 + if (!dig->afmt->enabled) 163 + return; 164 + offset = dig->afmt->offset; 165 + 166 + /* disable audio prior to setting up hw */ 167 + dig->afmt->pin = r600_audio_get_pin(rdev); 168 + r600_audio_enable(rdev, dig->afmt->pin, false); 169 + 170 + r600_audio_set_dto(encoder, mode->clock); 171 + 172 + WREG32(HDMI0_VBI_PACKET_CONTROL + offset, 173 + HDMI0_NULL_SEND); /* send null packets when required */ 174 + 175 + WREG32(HDMI0_AUDIO_CRC_CONTROL + offset, 0x1000); 176 + 177 + if (ASIC_IS_DCE32(rdev)) { 178 + WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, 179 + HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ 180 + HDMI0_AUDIO_PACKETS_PER_LINE(3)); /* should be suffient for all audio modes and small enough for all hblanks */ 181 + WREG32(AFMT_AUDIO_PACKET_CONTROL + offset, 182 + AFMT_AUDIO_SAMPLE_SEND | /* send audio packets */ 183 + AFMT_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ 184 + } else { 185 + WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, 186 + HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */ 187 + HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ 188 + HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */ 189 + HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ 190 + } 191 + 192 + if (ASIC_IS_DCE32(rdev)) { 193 + dce3_2_afmt_write_speaker_allocation(encoder); 194 + dce3_2_afmt_write_sad_regs(encoder); 195 + } 196 + 197 + WREG32(HDMI0_ACR_PACKET_CONTROL + offset, 198 + HDMI0_ACR_SOURCE | /* select SW CTS value - XXX verify that hw CTS works on all families */ 199 + HDMI0_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */ 200 + 201 + WREG32(HDMI0_VBI_PACKET_CONTROL + offset, 202 + HDMI0_NULL_SEND | /* send null packets when required */ 203 + HDMI0_GC_SEND | /* send general control packets */ 204 + HDMI0_GC_CONT); /* send general control packets every frame */ 205 + 206 + /* TODO: HDMI0_AUDIO_INFO_UPDATE */ 207 + WREG32(HDMI0_INFOFRAME_CONTROL0 + offset, 208 + HDMI0_AVI_INFO_SEND | /* enable AVI info frames */ 209 + HDMI0_AVI_INFO_CONT | /* send AVI info frames every frame/field */ 210 + HDMI0_AUDIO_INFO_SEND | /* enable audio info frames (frames won't be set until audio is enabled) */ 211 + HDMI0_AUDIO_INFO_CONT); /* send audio info frames every frame/field */ 212 + 213 + WREG32(HDMI0_INFOFRAME_CONTROL1 + offset, 214 + HDMI0_AVI_INFO_LINE(2) | /* anything other than 0 */ 215 + HDMI0_AUDIO_INFO_LINE(2)); /* anything other than 0 */ 216 + 217 + WREG32(HDMI0_GC + offset, 0); /* unset HDMI0_GC_AVMUTE */ 218 + 219 + err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); 220 + if (err < 0) { 221 + DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); 222 + return; 223 + } 224 + 225 + err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer)); 226 + if (err < 0) { 227 + DRM_ERROR("failed to pack AVI infoframe: %zd\n", err); 228 + return; 229 + } 230 + 231 + r600_hdmi_update_avi_infoframe(encoder, buffer, sizeof(buffer)); 232 + r600_hdmi_update_ACR(encoder, mode->clock); 233 + 234 + /* it's unknown what these bits do excatly, but it's indeed quite useful for debugging */ 235 + WREG32(HDMI0_RAMP_CONTROL0 + offset, 0x00FFFFFF); 236 + WREG32(HDMI0_RAMP_CONTROL1 + offset, 0x007FFFFF); 237 + WREG32(HDMI0_RAMP_CONTROL2 + offset, 0x00000001); 238 + WREG32(HDMI0_RAMP_CONTROL3 + offset, 0x00000001); 239 + 240 + r600_hdmi_audio_workaround(encoder); 241 + 242 + /* enable audio after to setting up hw */ 243 + r600_audio_enable(rdev, dig->afmt->pin, true); 244 + }
+10 -139
drivers/gpu/drm/radeon/r600_hdmi.c
··· 133 133 /* 134 134 * update the N and CTS parameters for a given pixel clock rate 135 135 */ 136 - static void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock) 136 + void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock) 137 137 { 138 138 struct drm_device *dev = encoder->dev; 139 139 struct radeon_device *rdev = dev->dev_private; ··· 155 155 /* 156 156 * build a HDMI Video Info Frame 157 157 */ 158 - static void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder, 159 - void *buffer, size_t size) 158 + void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder, void *buffer, 159 + size_t size) 160 160 { 161 161 struct drm_device *dev = encoder->dev; 162 162 struct radeon_device *rdev = dev->dev_private; ··· 231 231 /* 232 232 * write the audio workaround status to the hardware 233 233 */ 234 - static void r600_hdmi_audio_workaround(struct drm_encoder *encoder) 234 + void r600_hdmi_audio_workaround(struct drm_encoder *encoder) 235 235 { 236 236 struct drm_device *dev = encoder->dev; 237 237 struct radeon_device *rdev = dev->dev_private; ··· 250 250 value, ~HDMI0_AUDIO_TEST_EN); 251 251 } 252 252 253 - static void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) 253 + void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) 254 254 { 255 255 struct drm_device *dev = encoder->dev; 256 256 struct radeon_device *rdev = dev->dev_private; ··· 320 320 } 321 321 } 322 322 323 - static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder) 324 - { 325 - struct radeon_device *rdev = encoder->dev->dev_private; 326 - struct drm_connector *connector; 327 - struct radeon_connector *radeon_connector = NULL; 328 - u32 tmp; 329 - u8 *sadb; 330 - int sad_count; 331 - 332 - list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { 333 - if (connector->encoder == encoder) { 334 - radeon_connector = to_radeon_connector(connector); 335 - break; 336 - } 337 - } 338 - 339 - if (!radeon_connector) { 340 - DRM_ERROR("Couldn't find encoder's connector\n"); 341 - return; 342 - } 343 - 344 - sad_count = drm_edid_to_speaker_allocation(radeon_connector->edid, &sadb); 345 - if (sad_count < 0) { 346 - DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count); 347 - return; 348 - } 349 - 350 - /* program the speaker allocation */ 351 - tmp = RREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER); 352 - tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK); 353 - /* set HDMI mode */ 354 - tmp |= HDMI_CONNECTION; 355 - if (sad_count) 356 - tmp |= SPEAKER_ALLOCATION(sadb[0]); 357 - else 358 - tmp |= SPEAKER_ALLOCATION(5); /* stereo */ 359 - WREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER, tmp); 360 - 361 - kfree(sadb); 362 - } 363 - 364 - static void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder) 365 - { 366 - struct radeon_device *rdev = encoder->dev->dev_private; 367 - struct drm_connector *connector; 368 - struct radeon_connector *radeon_connector = NULL; 369 - struct cea_sad *sads; 370 - int i, sad_count; 371 - 372 - static const u16 eld_reg_to_type[][2] = { 373 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR0, HDMI_AUDIO_CODING_TYPE_PCM }, 374 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR1, HDMI_AUDIO_CODING_TYPE_AC3 }, 375 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR2, HDMI_AUDIO_CODING_TYPE_MPEG1 }, 376 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR3, HDMI_AUDIO_CODING_TYPE_MP3 }, 377 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR4, HDMI_AUDIO_CODING_TYPE_MPEG2 }, 378 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR5, HDMI_AUDIO_CODING_TYPE_AAC_LC }, 379 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR6, HDMI_AUDIO_CODING_TYPE_DTS }, 380 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR7, HDMI_AUDIO_CODING_TYPE_ATRAC }, 381 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR9, HDMI_AUDIO_CODING_TYPE_EAC3 }, 382 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR10, HDMI_AUDIO_CODING_TYPE_DTS_HD }, 383 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR11, HDMI_AUDIO_CODING_TYPE_MLP }, 384 - { AZ_F0_CODEC_PIN0_CONTROL_AUDIO_DESCRIPTOR13, HDMI_AUDIO_CODING_TYPE_WMA_PRO }, 385 - }; 386 - 387 - list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { 388 - if (connector->encoder == encoder) { 389 - radeon_connector = to_radeon_connector(connector); 390 - break; 391 - } 392 - } 393 - 394 - if (!radeon_connector) { 395 - DRM_ERROR("Couldn't find encoder's connector\n"); 396 - return; 397 - } 398 - 399 - sad_count = drm_edid_to_sad(radeon_connector->edid, &sads); 400 - if (sad_count < 0) { 401 - DRM_ERROR("Couldn't read SADs: %d\n", sad_count); 402 - return; 403 - } 404 - BUG_ON(!sads); 405 - 406 - for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) { 407 - u32 value = 0; 408 - u8 stereo_freqs = 0; 409 - int max_channels = -1; 410 - int j; 411 - 412 - for (j = 0; j < sad_count; j++) { 413 - struct cea_sad *sad = &sads[j]; 414 - 415 - if (sad->format == eld_reg_to_type[i][1]) { 416 - if (sad->channels > max_channels) { 417 - value = MAX_CHANNELS(sad->channels) | 418 - DESCRIPTOR_BYTE_2(sad->byte2) | 419 - SUPPORTED_FREQUENCIES(sad->freq); 420 - max_channels = sad->channels; 421 - } 422 - 423 - if (sad->format == HDMI_AUDIO_CODING_TYPE_PCM) 424 - stereo_freqs |= sad->freq; 425 - else 426 - break; 427 - } 428 - } 429 - 430 - value |= SUPPORTED_FREQUENCIES_STEREO(stereo_freqs); 431 - 432 - WREG32(eld_reg_to_type[i][0], value); 433 - } 434 - 435 - kfree(sads); 436 - } 437 - 438 323 /* 439 324 * update the info frames with the data from the current display mode 440 325 */ ··· 353 468 354 469 WREG32(HDMI0_AUDIO_CRC_CONTROL + offset, 0x1000); 355 470 356 - if (ASIC_IS_DCE32(rdev)) { 357 - WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, 358 - HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ 359 - HDMI0_AUDIO_PACKETS_PER_LINE(3)); /* should be suffient for all audio modes and small enough for all hblanks */ 360 - WREG32(AFMT_AUDIO_PACKET_CONTROL + offset, 361 - AFMT_AUDIO_SAMPLE_SEND | /* send audio packets */ 362 - AFMT_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ 363 - } else { 364 - WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, 365 - HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */ 366 - HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ 367 - HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */ 368 - HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ 369 - } 370 - 371 - if (ASIC_IS_DCE32(rdev)) { 372 - dce3_2_afmt_write_speaker_allocation(encoder); 373 - dce3_2_afmt_write_sad_regs(encoder); 374 - } 471 + WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, 472 + HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */ 473 + HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ 474 + HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */ 475 + HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ 375 476 376 477 WREG32(HDMI0_ACR_PACKET_CONTROL + offset, 377 478 HDMI0_ACR_SOURCE | /* select SW CTS value - XXX verify that hw CTS works on all families */
+1 -1
drivers/gpu/drm/radeon/radeon_asic.c
··· 1201 1201 .set_backlight_level = &atombios_set_backlight_level, 1202 1202 .get_backlight_level = &atombios_get_backlight_level, 1203 1203 .hdmi_enable = &r600_hdmi_enable, 1204 - .hdmi_setmode = &r600_hdmi_setmode, 1204 + .hdmi_setmode = &dce3_1_hdmi_setmode, 1205 1205 }, 1206 1206 .copy = { 1207 1207 .blit = &r600_copy_cpdma,
+7
drivers/gpu/drm/radeon/radeon_asic.h
··· 387 387 int r600_audio_init(struct radeon_device *rdev); 388 388 struct r600_audio_pin r600_audio_status(struct radeon_device *rdev); 389 389 void r600_audio_fini(struct radeon_device *rdev); 390 + void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock); 391 + void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder, void *buffer, 392 + size_t size); 393 + void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock); 394 + void r600_hdmi_audio_workaround(struct drm_encoder *encoder); 390 395 int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); 391 396 void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); 392 397 void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); ··· 463 458 u32 rv770_get_xclk(struct radeon_device *rdev); 464 459 int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk); 465 460 int rv770_get_temp(struct radeon_device *rdev); 461 + /* hdmi */ 462 + void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode); 466 463 /* rv7xx pm */ 467 464 int rv770_dpm_init(struct radeon_device *rdev); 468 465 int rv770_dpm_enable(struct radeon_device *rdev);