drm/radeon/kms: make atombios_dvo_setup() version based
Use table version numbers for param setup. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
3f03ced880
commit
24153dd35e
1 changed files with 37 additions and 20 deletions
|
@ -239,16 +239,27 @@ atombios_dvo_setup(struct drm_encoder *encoder, int action)
|
|||
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
|
||||
union dvo_encoder_control args;
|
||||
int index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl);
|
||||
uint8_t frev, crev;
|
||||
|
||||
memset(&args, 0, sizeof(args));
|
||||
|
||||
if (ASIC_IS_DCE3(rdev)) {
|
||||
/* DCE3+ */
|
||||
args.dvo_v3.ucAction = action;
|
||||
args.dvo_v3.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
|
||||
args.dvo_v3.ucDVOConfig = 0; /* XXX */
|
||||
} else if (ASIC_IS_DCE2(rdev)) {
|
||||
/* DCE2 (pre-DCE3 R6xx, RS600/690/740 */
|
||||
if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev))
|
||||
return;
|
||||
|
||||
switch (frev) {
|
||||
case 1:
|
||||
switch (crev) {
|
||||
case 1:
|
||||
/* R4xx, R5xx */
|
||||
args.ext_tmds.sXTmdsEncoder.ucEnable = action;
|
||||
|
||||
if (radeon_encoder->pixel_clock > 165000)
|
||||
args.ext_tmds.sXTmdsEncoder.ucMisc |= PANEL_ENCODER_MISC_DUAL;
|
||||
|
||||
args.ext_tmds.sXTmdsEncoder.ucMisc |= ATOM_PANEL_MISC_888RGB;
|
||||
break;
|
||||
case 2:
|
||||
/* RS600/690/740 */
|
||||
args.dvo.sDVOEncoder.ucAction = action;
|
||||
args.dvo.sDVOEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
|
||||
/* DFP1, CRT1, TV1 depending on the type of port */
|
||||
|
@ -256,15 +267,21 @@ atombios_dvo_setup(struct drm_encoder *encoder, int action)
|
|||
|
||||
if (radeon_encoder->pixel_clock > 165000)
|
||||
args.dvo.sDVOEncoder.usDevAttr.sDigAttrib.ucAttribute |= PANEL_ENCODER_MISC_DUAL;
|
||||
} else {
|
||||
/* R4xx, R5xx */
|
||||
args.ext_tmds.sXTmdsEncoder.ucEnable = action;
|
||||
|
||||
if (radeon_encoder->pixel_clock > 165000)
|
||||
args.ext_tmds.sXTmdsEncoder.ucMisc |= PANEL_ENCODER_MISC_DUAL;
|
||||
|
||||
/*if (pScrn->rgbBits == 8)*/
|
||||
args.ext_tmds.sXTmdsEncoder.ucMisc |= ATOM_PANEL_MISC_888RGB;
|
||||
break;
|
||||
case 3:
|
||||
/* R6xx */
|
||||
args.dvo_v3.ucAction = action;
|
||||
args.dvo_v3.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
|
||||
args.dvo_v3.ucDVOConfig = 0; /* XXX */
|
||||
break;
|
||||
default:
|
||||
DRM_ERROR("Unknown table version %d, %d\n", frev, crev);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
DRM_ERROR("Unknown table version %d, %d\n", frev, crev);
|
||||
break;
|
||||
}
|
||||
|
||||
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
|
||||
|
|
Loading…
Reference in a new issue