From 94b44d36d709b6c848e57e714a44bef4f5e334ae Mon Sep 17 00:00:00 2001 From: Li Peng Date: Fri, 13 Mar 2009 10:25:07 +0800 Subject: [PATCH] --- yaml --- r: 135983 b: refs/heads/master c: 2b5cde2b272f56ec67b56a2af8c067d42eff7328 h: refs/heads/master i: 135981: cbf124c4d7d8392ce6c2e925ffa848b20a063526 135979: 8b46cff6eaa868ed95ea50ada070a15a215708e5 135975: ef3b279dc7e8f477623a80716a463b465272f4ef 135967: 6497f7169cb560c4cbacdcfb1b562d76283c3ada v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_bios.h | 12 ++++++------ trunk/drivers/gpu/drm/i915/intel_lvds.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e776e30c8828..fe19f2042f6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98787c057fdefdce6230ff46f2c1105835005a4c +refs/heads/master: 2b5cde2b272f56ec67b56a2af8c067d42eff7328 diff --git a/trunk/drivers/gpu/drm/i915/intel_bios.h b/trunk/drivers/gpu/drm/i915/intel_bios.h index 5ea715ace3a0..de621aad85b5 100644 --- a/trunk/drivers/gpu/drm/i915/intel_bios.h +++ b/trunk/drivers/gpu/drm/i915/intel_bios.h @@ -162,13 +162,13 @@ struct bdb_lvds_options { u8 panel_type; u8 rsvd1; /* LVDS capabilities, stored in a dword */ - u8 rsvd2:1; - u8 lvds_edid:1; - u8 pixel_dither:1; - u8 pfit_ratio_auto:1; - u8 pfit_gfx_mode_enhanced:1; - u8 pfit_text_mode_enhanced:1; u8 pfit_mode:2; + u8 pfit_text_mode_enhanced:1; + u8 pfit_gfx_mode_enhanced:1; + u8 pfit_ratio_auto:1; + u8 pixel_dither:1; + u8 lvds_edid:1; + u8 rsvd2:1; u8 rsvd4; } __attribute__((packed)); diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c index 0d211af98854..6619f26e46a5 100644 --- a/trunk/drivers/gpu/drm/i915/intel_lvds.c +++ b/trunk/drivers/gpu/drm/i915/intel_lvds.c @@ -265,7 +265,7 @@ static void intel_lvds_mode_set(struct drm_encoder *encoder, pfit_control = 0; if (!IS_I965G(dev)) { - if (dev_priv->panel_wants_dither) + if (dev_priv->panel_wants_dither || dev_priv->lvds_dither) pfit_control |= PANEL_8TO6_DITHER_ENABLE; } else