From 6dd7b8ede2da0ae0ac0d01ab5391088482300df4 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 11 Jul 2011 19:41:09 +0100 Subject: [PATCH] --- yaml --- r: 260052 b: refs/heads/master c: 78010c75d290d8061fbbd75625101f382c44f204 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/cdv_intel_lvds.c | 3 ++- trunk/drivers/staging/gma500/mrst_lvds.c | 5 ++++- trunk/drivers/staging/gma500/psb_intel_lvds.c | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d5f4750367ab..55aaeb2ff421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f00dfacb5123f2c439973347bf9ec7ebf3af8719 +refs/heads/master: 78010c75d290d8061fbbd75625101f382c44f204 diff --git a/trunk/drivers/staging/gma500/cdv_intel_lvds.c b/trunk/drivers/staging/gma500/cdv_intel_lvds.c index 19ad9bb8ffe0..d9478d565ff5 100644 --- a/trunk/drivers/staging/gma500/cdv_intel_lvds.c +++ b/trunk/drivers/staging/gma500/cdv_intel_lvds.c @@ -356,6 +356,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder, struct psb_intel_mode_device *mode_dev = enc_to_psb_intel_output(encoder)->mode_dev; struct drm_device *dev = encoder->dev; + struct drm_psb_private *dev_priv = dev->dev_private; u32 pfit_control; /* @@ -377,7 +378,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder, else pfit_control = 0; - if (mode_dev->panel_wants_dither) + if (dev_priv->lvds_dither) pfit_control |= PANEL_8TO6_DITHER_ENABLE; REG_WRITE(PFIT_CONTROL, pfit_control); diff --git a/trunk/drivers/staging/gma500/mrst_lvds.c b/trunk/drivers/staging/gma500/mrst_lvds.c index 127b2003edaf..3e15ecd4bd2c 100644 --- a/trunk/drivers/staging/gma500/mrst_lvds.c +++ b/trunk/drivers/staging/gma500/mrst_lvds.c @@ -91,6 +91,7 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder, struct psb_intel_mode_device *mode_dev = enc_to_psb_intel_output(encoder)->mode_dev; struct drm_device *dev = encoder->dev; + struct drm_psb_private *dev_priv = dev->dev_private; u32 lvds_port; uint64_t v = DRM_MODE_SCALE_FULLSCREEN; @@ -107,7 +108,9 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder, LVDS_PORT_EN | LVDS_BORDER_EN; - if (mode_dev->panel_wants_dither) + /* If the firmware says dither on Moorestown, or the BIOS does + on Oaktrail then enable dithering */ + if (mode_dev->panel_wants_dither || dev_priv->lvds_dither) lvds_port |= MRST_PANEL_8TO6_DITHER_ENABLE; REG_WRITE(LVDS, lvds_port); diff --git a/trunk/drivers/staging/gma500/psb_intel_lvds.c b/trunk/drivers/staging/gma500/psb_intel_lvds.c index c4111b594fb8..03132a4e7dfd 100644 --- a/trunk/drivers/staging/gma500/psb_intel_lvds.c +++ b/trunk/drivers/staging/gma500/psb_intel_lvds.c @@ -470,6 +470,7 @@ static void psb_intel_lvds_mode_set(struct drm_encoder *encoder, struct psb_intel_mode_device *mode_dev = enc_to_psb_intel_output(encoder)->mode_dev; struct drm_device *dev = encoder->dev; + struct drm_psb_private *dev_priv = dev->dev_private; u32 pfit_control; /* @@ -491,7 +492,7 @@ static void psb_intel_lvds_mode_set(struct drm_encoder *encoder, else pfit_control = 0; - if (mode_dev->panel_wants_dither) + if (dev_priv->lvds_dither) pfit_control |= PANEL_8TO6_DITHER_ENABLE; REG_WRITE(PFIT_CONTROL, pfit_control);