The patch titled
     Intel FB: support for interlaced video modes
has been removed from the -mm tree.  Its filename was
     intel-fb-support-for-interlaced-video-modes.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: Intel FB: support for interlaced video modes
From: Krzysztof Halasa <[EMAIL PROTECTED]>

Intel framebuffer now supports interlaced video modes.

Signed-off-by: Krzysztof Halasa <[EMAIL PROTECTED]>
Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
Cc: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/video/intelfb/intelfbhw.c |   12 +++++++-----
 drivers/video/intelfb/intelfbhw.h |    4 ++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff -puN 
drivers/video/intelfb/intelfbhw.c~intel-fb-support-for-interlaced-video-modes 
drivers/video/intelfb/intelfbhw.c
--- 
a/drivers/video/intelfb/intelfbhw.c~intel-fb-support-for-interlaced-video-modes
+++ a/drivers/video/intelfb/intelfbhw.c
@@ -323,11 +323,7 @@ intelfbhw_validate_mode(struct intelfb_i
                return 1;
        }
 
-       /* Check for interlaced/doublescan modes. */
-       if (var->vmode & FB_VMODE_INTERLACED) {
-               WRN_MSG("Mode is interlaced.\n");
-               return 1;
-       }
+       /* Check for doublescan modes. */
        if (var->vmode & FB_VMODE_DOUBLE) {
                WRN_MSG("Mode is double-scan.\n");
                return 1;
@@ -1220,6 +1216,12 @@ intelfbhw_mode_to_hw(struct intelfb_info
 
        /* Set the palette to 8-bit mode. */
        *pipe_conf &= ~PIPECONF_GAMMA;
+
+       if (var->vmode & FB_VMODE_INTERLACED)
+               *pipe_conf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
+       else
+               *pipe_conf &= ~PIPECONF_INTERLACE_MASK;
+
        return 0;
 }
 
diff -puN 
drivers/video/intelfb/intelfbhw.h~intel-fb-support-for-interlaced-video-modes 
drivers/video/intelfb/intelfbhw.h
--- 
a/drivers/video/intelfb/intelfbhw.h~intel-fb-support-for-interlaced-video-modes
+++ a/drivers/video/intelfb/intelfbhw.h
@@ -286,6 +286,10 @@
 #define PIPECONF_UNLOCKED              0
 #define PIPECONF_GAMMA                 (1 << 24)
 #define PIPECONF_PALETTE               0
+#define PIPECONF_PROGRESSIVE                   (0 << 21)
+#define PIPECONF_INTERLACE_W_FIELD_INDICATION  (6 << 21)
+#define PIPECONF_INTERLACE_FIELD_0_ONLY                (7 << 21)
+#define PIPECONF_INTERLACE_MASK                        (7 << 21)
 
 #define DISPARB                        0x70030
 #define DISPARB_AEND_MASK              0x1ff
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-wireless.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to