From: Jordan Crouse Date: Fri, 8 Dec 2006 10:40:55 +0000 (-0800) Subject: [PATCH] gxfb: Fixup flatpanel detection X-Git-Tag: v2.6.20-rc1~34^2~61 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=53d53bd4ab3fd1498f728fa96635ab95d1ec8ba0;p=linux-2.6-omap-h63xx.git [PATCH] gxfb: Fixup flatpanel detection Use the right MSR and bits to detect if the GX is strapped for TFT or CRT Signed-off-by: Jordan Crouse Cc: "Antonino A. Daplas" Acked-by: James Simmons Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h index ba0ccc82bf2..0af33f329e8 100644 --- a/drivers/video/geode/display_gx.h +++ b/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 --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c index 47a68802e94..cf841efa229 100644 --- a/drivers/video/geode/gxfb_core.c +++ b/drivers/video/geode/gxfb_core.c @@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i 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 --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h index 8f1e85bfa94..119d0abddb2 100644 --- a/drivers/video/geode/video_gx.h +++ b/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