Fix a typo in the last patch. new version attached. Alex
On Fri, Mar 26, 2010 at 2:04 AM, Alex Deucher <alexdeuc...@gmail.com> wrote:
> From 6ff965f44f6c0540e29e616621abac627b506436 Mon Sep 17 00:00:00 2001
> From: Alex Deucher <alexdeuc...@gmail.com>
> Date: Fri, 26 Mar 2010 01:57:34 -0400
> Subject: [PATCH] drm/radeon/kms: minor fixes for eDP with LCD* device tags
>
> Some systems have LCD* rather than DFP* device tags in the bios
> for eDP connectors; notably the new apple iMac. This fixes
> things up so eDP connectors with either tag will work.
>
> Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
> ---
> drivers/gpu/drm/radeon/atombios_crtc.c | 13 +++++++++----
> drivers/gpu/drm/radeon/radeon_encoders.c | 2 +-
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c
> b/drivers/gpu/drm/radeon/atombios_crtc.c
> index 791db2e..6300675 100644
> --- a/drivers/gpu/drm/radeon/atombios_crtc.c
> +++ b/drivers/gpu/drm/radeon/atombios_crtc.c
> @@ -577,11 +577,16 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
> }
> } else if (radeon_encoder->devices &
> (ATOM_DEVICE_LCD_SUPPORT)) {
> /* may want to enable SS on DP/eDP
> eventually */
> - args.v3.sInput.ucDispPllConfig |=
> - DISPPLL_CONFIG_SS_ENABLE;
> - if (mode->clock > 165000)
> + /*args.v3.sInput.ucDispPllConfig |=
> + DISPPLL_CONFIG_SS_ENABLE;*/
> + if (encoder_mode ==
> ATOM_ENCODER_MODE_DP)
> args.v3.sInput.ucDispPllConfig
> |=
> -
> DISPPLL_CONFIG_DUAL_LINK;
> +
> DISPPLL_CONFIG_COHERENT_MODE;
> + else {
> + if (mode->clock > 165000)
> +
> args.v3.sInput.ucDispPllConfig |=
> +
> DISPPLL_CONFIG_DUAL_LINK;
> + }
> }
>
> atom_execute_table(rdev->mode_info.atom_context,
> index, (uint32_t *)&args);
> diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c
> b/drivers/gpu/drm/radeon/radeon_encoders.c
> index fd4052f..3330e11 100644
> --- a/drivers/gpu/drm/radeon/radeon_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
> @@ -302,7 +302,7 @@ static bool radeon_atom_mode_fixup(struct
> drm_encoder *encoder,
> }
>
> if (ASIC_IS_DCE3(rdev) &&
> - (radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT))) {
> + (radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT ||
> ATOM_DEVICE_LCD_SUPPORT))) {
> struct drm_connector *connector =
> radeon_get_connector_for_encoder(encoder);
> radeon_dp_set_link_config(connector, mode);
> }
> --
> 1.5.6.3
>
0001-drm-radeon-kms-minor-fixes-for-eDP-with-LCD-device.patch
Description: application/mbox
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
-- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
