2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 5ea715ace3a0..de621aad85b5 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/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/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 0d211af98854..6619f26e46a5 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/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