From a8cf33d47660f1fd25d72498dba5d12ffab0767a Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 6 Apr 2009 14:37:19 -0400 Subject: [PATCH] radeon: pull in my latest modesetting fixes from the ddx Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/atombios_crtc.c | 2 +- drivers/gpu/drm/radeon/radeon_encoders.c | 227 ++++++++++------------- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 3 +- drivers/gpu/drm/radeon/radeon_mode.h | 6 +- 4 files changed, 104 insertions(+), 134 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index b79744a..fe4240c 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -222,7 +222,7 @@ atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode) if (!ASIC_IS_AVIVO(rdev)) { if (encoder->encoder_type != DRM_MODE_ENCODER_DAC) pll_flags |= RADEON_PLL_NO_ODD_POST_DIV; - if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) + if (!ASIC_IS_AVIVO(rdev) && (encoder->encoder_type == DRM_MODE_ENCODER_LVDS)) pll_flags |= RADEON_PLL_USE_REF_DIV; } radeon_encoder = to_radeon_encoder(encoder); diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 91d6ac5..28c7c9c 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -220,8 +220,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, } static void -atombios_dac_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_dac_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; @@ -246,7 +245,7 @@ atombios_dac_setup(struct drm_encoder *encoder, break; } - args.ucAction = ATOM_ENABLE; + args.ucAction = action; if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) args.ucDacStandard = ATOM_DAC1_PS2; @@ -269,15 +268,14 @@ atombios_dac_setup(struct drm_encoder *encoder, break; } } - args.usPixelClock = cpu_to_le16(mode->clock / 10); + args.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); } static void -atombios_tv_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_tv_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; @@ -291,7 +289,7 @@ atombios_tv_setup(struct drm_encoder *encoder, index = GetIndexIntoMasterTable(COMMAND, TVEncoderControl); - args.sTVEncoder.ucAction = ATOM_ENABLE; + args.sTVEncoder.ucAction = action; if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT)) args.sTVEncoder.ucTvStandard = ATOM_TV_CV; @@ -327,18 +325,18 @@ atombios_tv_setup(struct drm_encoder *encoder, } } - args.sTVEncoder.usPixelClock = cpu_to_le16(mode->clock / 10); + args.sTVEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); } void -atombios_external_tmds_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_external_tmds_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION args; int index = 0; @@ -346,9 +344,9 @@ atombios_external_tmds_setup(struct drm_encoder *encoder, index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl); - args.sXTmdsEncoder.ucEnable = ATOM_ENABLE; + args.sXTmdsEncoder.ucEnable = action; - if (mode->clock > 165000) + if (radeon_encoder->pixel_clock > 165000) args.sXTmdsEncoder.ucMisc = PANEL_ENCODER_MISC_DUAL; /*if (pScrn->rgbBits == 8)*/ @@ -359,11 +357,11 @@ atombios_external_tmds_setup(struct drm_encoder *encoder, } static void -atombios_ddia_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_ddia_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); DVO_ENCODER_CONTROL_PS_ALLOCATION args; int index = 0; @@ -371,10 +369,10 @@ atombios_ddia_setup(struct drm_encoder *encoder, index = GetIndexIntoMasterTable(COMMAND, DVOEncoderControl); - args.sDVOEncoder.ucAction = ATOM_ENABLE; - args.sDVOEncoder.usPixelClock = cpu_to_le16(mode->clock / 10); + args.sDVOEncoder.ucAction = action; + args.sDVOEncoder.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); - if (mode->clock > 165000) + if (radeon_encoder->pixel_clock > 165000) args.sDVOEncoder.usDevAttr.sDigAttrib.ucAttribute = PANEL_ENCODER_MISC_DUAL; atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); @@ -387,8 +385,7 @@ union lvds_encoder_control { }; static void -atombios_digital_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_digital_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; @@ -443,12 +440,12 @@ atombios_digital_setup(struct drm_encoder *encoder, switch (crev) { case 1: args.v1.ucMisc = 0; - args.v1.ucAction = PANEL_ENCODER_ACTION_ENABLE; + args.v1.ucAction = action; /* XXX should probably check based on edid */ if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) || (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)) args.v1.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE; - args.v1.usPixelClock = cpu_to_le16(mode->clock / 10); + args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { if (dig->lvds_misc & (1 << 0)) args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL; @@ -457,7 +454,7 @@ atombios_digital_setup(struct drm_encoder *encoder, } else { if (dig_connector->linkb) args.v1.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB; - if (mode->clock > 165000) + if (radeon_encoder->pixel_clock > 165000) args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL; /*if (pScrn->rgbBits == 8) */ args.v1.ucMisc |= (1 << 1); @@ -466,7 +463,7 @@ atombios_digital_setup(struct drm_encoder *encoder, case 2: case 3: args.v2.ucMisc = 0; - args.v2.ucAction = PANEL_ENCODER_ACTION_ENABLE; + args.v2.ucAction = action; if (crev == 3) { if (dig->coherent_mode) args.v2.ucMisc |= PANEL_ENCODER_MISC_COHERENT; @@ -475,7 +472,7 @@ atombios_digital_setup(struct drm_encoder *encoder, if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) || (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)) args.v2.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE; - args.v2.usPixelClock = cpu_to_le16(mode->clock / 10); + args.v2.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); args.v2.ucTruncate = 0; args.v2.ucSpatial = 0; args.v2.ucTemporal = 0; @@ -498,7 +495,7 @@ atombios_digital_setup(struct drm_encoder *encoder, } else { if (dig_connector->linkb) args.v2.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB; - if (mode->clock > 165000) + if (radeon_encoder->pixel_clock > 165000) args.v2.ucMisc |= PANEL_ENCODER_MISC_DUAL; } break; @@ -583,16 +580,15 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) } static void -atombios_dig_encoder_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_dig_encoder_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); DIG_ENCODER_CONTROL_PS_ALLOCATION args; int index = 0, num = 0; uint8_t frev, crev; + struct radeon_encoder_atom_dig *dig; struct drm_connector *connector; struct radeon_connector *radeon_connector; struct radeon_connector_atom_dig *dig_connector; @@ -608,24 +604,25 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, dig_connector = radeon_connector->con_priv; + if (!radeon_encoder->enc_priv) + return; + + dig = radeon_encoder->enc_priv; + memset(&args, 0, sizeof(args)); if (ASIC_IS_DCE32(rdev)) { - if (radeon_crtc->crtc_id) + if (dig->dig_block) index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); else index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); - num = radeon_crtc->crtc_id + 1; + num = dig->dig_block + 1; } else { switch (radeon_encoder->encoder_id) { - case ENCODER_OBJECT_ID_INTERNAL_TMDS1: - case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); num = 1; break; - case ENCODER_OBJECT_ID_INTERNAL_LVDS: - case ENCODER_OBJECT_ID_INTERNAL_LVTM1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); num = 2; @@ -635,8 +632,8 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); - args.ucAction = ATOM_ENABLE; - args.usPixelClock = cpu_to_le16(mode->clock / 10); + args.ucAction = action; + args.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); if (ASIC_IS_DCE32(rdev)) { switch (radeon_encoder->encoder_id) { @@ -652,20 +649,16 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, } } else { switch (radeon_encoder->encoder_id) { - case ENCODER_OBJECT_ID_INTERNAL_TMDS1: - case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: args.ucConfig = ATOM_ENCODER_CONFIG_TRANSMITTER1; break; - case ENCODER_OBJECT_ID_INTERNAL_LVDS: - case ENCODER_OBJECT_ID_INTERNAL_LVTM1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: args.ucConfig = ATOM_ENCODER_CONFIG_TRANSMITTER2; break; } } - if (mode->clock > 165000) { + if (radeon_encoder->pixel_clock > 165000) { args.ucConfig |= ATOM_ENCODER_CONFIG_LINKA_B; args.ucLaneNum = 8; } else { @@ -688,13 +681,11 @@ union dig_transmitter_control { }; static void -atombios_dig_transmitter_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); union dig_transmitter_control args; int index = 0, num = 0; uint8_t frev, crev; @@ -725,13 +716,9 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl); else { switch (radeon_encoder->encoder_id) { - case ENCODER_OBJECT_ID_INTERNAL_TMDS1: - case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl); break; - case ENCODER_OBJECT_ID_INTERNAL_LVDS: - case ENCODER_OBJECT_ID_INTERNAL_LVTM1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl); break; @@ -740,16 +727,16 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); - args.v1.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE; + args.v1.ucAction = action; if (ASIC_IS_DCE32(rdev)) { - if (mode->clock > 165000) { - args.v2.usPixelClock = cpu_to_le16((mode->clock * 10 * 2) / 100); + if (radeon_encoder->pixel_clock > 165000) { + args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock * 10 * 2) / 100); args.v2.acConfig.fDualLinkConnector = 1; } else { - args.v2.usPixelClock = cpu_to_le16((mode->clock * 10 * 4) / 100); + args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock * 10 * 4) / 100); } - if (radeon_crtc->crtc_id) + if (dig->dig_block) args.v2.acConfig.ucEncoderSel = 1; switch (radeon_encoder->encoder_id) { @@ -773,24 +760,20 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, } } else { args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL; - args.v1.usPixelClock = cpu_to_le16((mode->clock) / 10); + args.v1.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock) / 10); switch (radeon_encoder->encoder_id) { - case ENCODER_OBJECT_ID_INTERNAL_TMDS1: - case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; if (rdev->flags & RADEON_IS_IGP) { - if (mode->clock > 165000) { + if (radeon_encoder->pixel_clock > 165000) { args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK | ATOM_TRANSMITTER_CONFIG_LINKA_B); - /* fixme!!! lanes are based on connector, not encoder*/ if (dig_connector->igp_lane_info & 0x3) args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_7; else if (dig_connector->igp_lane_info & 0xc) args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_15; } else { - /* fixme!!! lanes are based on connector, not encoder*/ args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA; if (dig_connector->igp_lane_info & 0x1) args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3; @@ -802,7 +785,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15; } } else { - if (mode->clock > 165000) + if (radeon_encoder->pixel_clock > 165000) args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK | ATOM_TRANSMITTER_CONFIG_LINKA_B | ATOM_TRANSMITTER_CONFIG_LANE_0_7); @@ -814,11 +797,9 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, } } break; - case ENCODER_OBJECT_ID_INTERNAL_LVDS: - case ENCODER_OBJECT_ID_INTERNAL_LVTM1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER; - if (mode->clock > 165000) + if (radeon_encoder->pixel_clock > 165000) args.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK | ATOM_TRANSMITTER_CONFIG_LINKA_B | ATOM_TRANSMITTER_CONFIG_LANE_0_7); @@ -836,7 +817,6 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT; } } - dig->transmitter_config = args.v1.ucConfig; atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); @@ -1075,18 +1055,37 @@ atombios_yuv_setup(struct drm_encoder *encoder, bool enable) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); ENABLE_YUV_PS_ALLOCATION args; int index = GetIndexIntoMasterTable(COMMAND, EnableYUV); + uint32_t temp, reg; memset(&args, 0, sizeof(args)); + if (rdev->family >= CHIP_R600) + reg = R600_BIOS_3_SCRATCH; + else + reg = RADEON_BIOS_3_SCRATCH; + + /* XXX: fix up scratch reg handling */ + temp = RREG32(reg); + if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT)) + WREG32(reg, (ATOM_S3_TV1_ACTIVE | + (radeon_crtc->crtc_id << 18))); + else if (radeon_encoder->devices & (ATOM_DEVICE_CV_SUPPORT)) + WREG32(reg, (ATOM_S3_CV_ACTIVE | + (radeon_crtc->crtc_id << 24))); + else + WREG32(reg, 0); + if (enable) args.ucEnable = ATOM_ENABLE; args.ucCRTC = radeon_crtc->crtc_id; atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); + WREG32(reg, temp); } static void @@ -1139,8 +1138,7 @@ atombios_overscan_setup(struct drm_encoder *encoder, } static void -atombios_scaler_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode) +atombios_scaler_setup(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; @@ -1214,57 +1212,6 @@ atombios_scaler_setup(struct drm_encoder *encoder, } static void -atombios_dig_dpms(struct drm_encoder *encoder, int mode) -{ - struct drm_device *dev = encoder->dev; - struct radeon_device *rdev = dev->dev_private; - struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - DIG_TRANSMITTER_CONTROL_PS_ALLOCATION args; - int index = 0; - struct radeon_encoder_atom_dig *dig; - - if (!radeon_encoder->enc_priv) - return; - - dig = radeon_encoder->enc_priv; - - memset(&args, 0, sizeof(args)); - - switch (mode) { - case DRM_MODE_DPMS_ON: - args.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT; - break; - case DRM_MODE_DPMS_STANDBY: - case DRM_MODE_DPMS_SUSPEND: - case DRM_MODE_DPMS_OFF: - args.ucAction = ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT; - break; - } - - args.ucConfig = dig->transmitter_config; - - if (ASIC_IS_DCE32(rdev)) - index = GetIndexIntoMasterTable(COMMAND, UNIPHYTransmitterControl); - else { - switch (radeon_encoder->encoder_id) { - case ENCODER_OBJECT_ID_INTERNAL_TMDS1: - case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: - case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: - index = GetIndexIntoMasterTable(COMMAND, DIG1TransmitterControl); - break; - case ENCODER_OBJECT_ID_INTERNAL_LVDS: - case ENCODER_OBJECT_ID_INTERNAL_LVTM1: - case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: - index = GetIndexIntoMasterTable(COMMAND, DIG2TransmitterControl); - break; - } - } - - atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); - -} - -static void radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) { struct drm_device *dev = encoder->dev; @@ -1321,9 +1268,18 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) break; } - if (is_dig) - atombios_dig_dpms(encoder, mode); - else { + if (is_dig) { + switch (mode) { + case DRM_MODE_DPMS_ON: + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE); + break; + case DRM_MODE_DPMS_STANDBY: + case DRM_MODE_DPMS_SUSPEND: + case DRM_MODE_DPMS_OFF: + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE); + break; + } + } else { switch (mode) { case DRM_MODE_DPMS_ON: args.ucAction = ATOM_ENABLE; @@ -1497,9 +1453,17 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); + if (radeon_encoder->enc_priv) { + struct radeon_encoder_atom_dig *dig; + + dig = radeon_encoder->enc_priv; + dig->dig_block = radeon_crtc->crtc_id; + } + radeon_encoder->pixel_clock = adjusted_mode->clock; + radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id); atombios_overscan_setup(encoder, mode, adjusted_mode); - atombios_scaler_setup(encoder, adjusted_mode); + atombios_scaler_setup(encoder); atombios_set_encoder_crtc_source(encoder); if (ASIC_IS_AVIVO(rdev)) { @@ -1514,29 +1478,31 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_LVDS: case ENCODER_OBJECT_ID_INTERNAL_LVTM1: - atombios_digital_setup(encoder, adjusted_mode); + atombios_digital_setup(encoder, PANEL_ENCODER_ACTION_ENABLE); break; case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: - atombios_dig_encoder_setup(encoder, adjusted_mode); - atombios_dig_transmitter_setup(encoder, adjusted_mode); + atombios_dig_encoder_setup(encoder, ATOM_ENABLE); + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_INIT); + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP); + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE); break; case ENCODER_OBJECT_ID_INTERNAL_DDI: - atombios_ddia_setup(encoder, adjusted_mode); + atombios_ddia_setup(encoder, ATOM_ENABLE); break; case ENCODER_OBJECT_ID_INTERNAL_DVO1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: - atombios_external_tmds_setup(encoder, adjusted_mode); + atombios_external_tmds_setup(encoder, ATOM_ENABLE); break; case ENCODER_OBJECT_ID_INTERNAL_DAC1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: case ENCODER_OBJECT_ID_INTERNAL_DAC2: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: - atombios_dac_setup(encoder, adjusted_mode); + atombios_dac_setup(encoder, ATOM_ENABLE); if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT)) - atombios_tv_setup(encoder, adjusted_mode); + atombios_tv_setup(encoder, ATOM_ENABLE); break; } atombios_apply_encoder_quirks(encoder, adjusted_mode); @@ -1576,8 +1542,11 @@ atombios_dac_load_detect(struct drm_encoder *encoder) args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CV_SUPPORT); if (crev >= 3) args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb; - } else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) + } else if (radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) { args.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_TV1_SUPPORT); + if (crev >= 3) + args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb; + } atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 4f717fc..1973009 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -824,7 +824,8 @@ static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder, radeon_legacy_rmx_mode_set(encoder, mode, adjusted_mode); if (rdev->is_atom_bios) { - atombios_external_tmds_setup(encoder, adjusted_mode); + radeon_encoder->pixel_clock = adjusted_mode->clock; + atombios_external_tmds_setup(encoder, ATOM_ENABLE); fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); } else { fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index f9b93bb..5034aa8 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -238,8 +238,8 @@ struct radeon_encoder_int_tmds { struct radeon_encoder_atom_dig { /* atom dig */ - uint32_t transmitter_config; bool coherent_mode; + int dig_block; /* atom lvds */ uint32_t lvds_misc; uint16_t panel_pwr_delay; @@ -252,6 +252,7 @@ struct radeon_encoder { uint32_t encoder_id; uint32_t devices; uint32_t flags; + uint32_t pixel_clock; enum radeon_rmx_type rmx_type; struct radeon_native_mode native_mode; void *enc_priv; @@ -299,8 +300,7 @@ struct drm_encoder *radeon_encoder_legacy_primary_dac_add(struct drm_device *dev struct drm_encoder *radeon_encoder_legacy_tv_dac_add(struct drm_device *dev, int bios_index, int with_tv); struct drm_encoder *radeon_encoder_legacy_tmds_int_add(struct drm_device *dev, int bios_index); struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, int bios_index); -extern void atombios_external_tmds_setup(struct drm_encoder *encoder, - struct drm_display_mode *mode); +extern void atombios_external_tmds_setup(struct drm_encoder *encoder, int action); extern int atombios_get_encoder_mode(struct drm_encoder *encoder); extern void radeon_crtc_load_lut(struct drm_crtc *crtc); -- 1.5.6.3