aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/intelfb/intelfbhw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
-rw-r--r--drivers/video/intelfb/intelfbhw.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 6a47682d8614..04d0e0fd9bc0 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -323,11 +323,7 @@ intelfbhw_validate_mode(struct intelfb_info *dinfo,
323 return 1; 323 return 1;
324 } 324 }
325 325
326 /* Check for interlaced/doublescan modes. */ 326 /* Check for doublescan modes. */
327 if (var->vmode & FB_VMODE_INTERLACED) {
328 WRN_MSG("Mode is interlaced.\n");
329 return 1;
330 }
331 if (var->vmode & FB_VMODE_DOUBLE) { 327 if (var->vmode & FB_VMODE_DOUBLE) {
332 WRN_MSG("Mode is double-scan.\n"); 328 WRN_MSG("Mode is double-scan.\n");
333 return 1; 329 return 1;
@@ -1220,6 +1216,12 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,
1220 1216
1221 /* Set the palette to 8-bit mode. */ 1217 /* Set the palette to 8-bit mode. */
1222 *pipe_conf &= ~PIPECONF_GAMMA; 1218 *pipe_conf &= ~PIPECONF_GAMMA;
1219
1220 if (var->vmode & FB_VMODE_INTERLACED)
1221 *pipe_conf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
1222 else
1223 *pipe_conf &= ~PIPECONF_INTERLACE_MASK;
1224
1223 return 0; 1225 return 0;
1224} 1226}
1225 1227