The patch titled
gxfb: Fixup flatpanel detection
has been removed from the -mm tree. Its filename was
gxfb-fixup-flatpanel-detection.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: gxfb: Fixup flatpanel detection
From: Jordan Crouse <jordan.crouse@xxxxxxx>
Use the right MSR and bits to detect if the GX is strapped for TFT or CRT
Signed-off-by: Jordan Crouse <jordan.crouse@xxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Acked-by: James Simmons <jsimmons@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/geode/display_gx.h | 2 +-
drivers/video/geode/gxfb_core.c | 2 +-
drivers/video/geode/video_gx.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/video/geode/display_gx.h~gxfb-fixup-flatpanel-detection drivers/video/geode/display_gx.h
--- a/drivers/video/geode/display_gx.h~gxfb-fixup-flatpanel-detection
+++ a/drivers/video/geode/display_gx.h
@@ -18,7 +18,7 @@ extern struct geode_dc_ops gx_dc_ops;
/* MSR that tells us if a TFT or CRT is attached */
#define GLD_MSR_CONFIG 0xC0002001
-#define GLD_MSR_CONFIG_FMT_FP 0x01
+#define GLD_MSR_CONFIG_DM_FP 0x40
/* Display controller registers */
diff -puN drivers/video/geode/gxfb_core.c~gxfb-fixup-flatpanel-detection drivers/video/geode/gxfb_core.c
--- a/drivers/video/geode/gxfb_core.c~gxfb-fixup-flatpanel-detection
+++ a/drivers/video/geode/gxfb_core.c
@@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_
rdmsrl(GLD_MSR_CONFIG, val);
- if (val & GLD_MSR_CONFIG_FMT_FP)
+ if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
par->enable_crt = 0;
else
par->enable_crt = 1;
diff -puN drivers/video/geode/video_gx.h~gxfb-fixup-flatpanel-detection drivers/video/geode/video_gx.h
--- a/drivers/video/geode/video_gx.h~gxfb-fixup-flatpanel-detection
+++ a/drivers/video/geode/video_gx.h
@@ -14,7 +14,7 @@
extern struct geode_vid_ops gx_vid_ops;
/* GX Flatpanel control MSR */
-#define GX_VP_MSR_PAD_SELECT 0x2011
+#define GX_VP_MSR_PAD_SELECT 0xC0002011
#define GX_VP_PAD_SELECT_MASK 0x3FFFFFFF
#define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF
_
Patches currently in -mm which might be from jordan.crouse@xxxxxxx are
origin.patch
gxfb-fixup-flatpanel-detection.patch
gxfb-turn-on-the-flatpanel-power-and-data.patch
acpi-clear-gpe-before-disabling-it.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
