diff options
| author | Jordan Crouse <jordan.crouse@amd.com> | 2006-12-08 02:40:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:08 -0800 |
| commit | 53d53bd4ab3fd1498f728fa96635ab95d1ec8ba0 (patch) | |
| tree | 7da8b278d058bbcbfc25f26aa38c2014cadcdfc5 /drivers/video | |
| parent | 16ef9870959621fa437d25ead28a7199acc6ce49 (diff) | |
[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 <jordan.crouse@amd.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/geode/display_gx.h | 2 | ||||
| -rw-r--r-- | drivers/video/geode/gxfb_core.c | 2 | ||||
| -rw-r--r-- | drivers/video/geode/video_gx.h | 2 |
3 files changed, 3 insertions, 3 deletions
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 |