aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/geode/display_gx.h2
-rw-r--r--drivers/video/geode/gxfb_core.c2
-rw-r--r--drivers/video/geode/video_gx.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
index ba0ccc82bf22..0af33f329e88 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;
18 18
19/* MSR that tells us if a TFT or CRT is attached */ 19/* MSR that tells us if a TFT or CRT is attached */
20#define GLD_MSR_CONFIG 0xC0002001 20#define GLD_MSR_CONFIG 0xC0002001
21#define GLD_MSR_CONFIG_FMT_FP 0x01 21#define GLD_MSR_CONFIG_DM_FP 0x40
22 22
23/* Display controller registers */ 23/* Display controller registers */
24 24
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 47a68802e94f..cf841efa229a 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
328 328
329 rdmsrl(GLD_MSR_CONFIG, val); 329 rdmsrl(GLD_MSR_CONFIG, val);
330 330
331 if (val & GLD_MSR_CONFIG_FMT_FP) 331 if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
332 par->enable_crt = 0; 332 par->enable_crt = 0;
333 else 333 else
334 par->enable_crt = 1; 334 par->enable_crt = 1;
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
index 8f1e85bfa945..119d0abddb2d 100644
--- a/drivers/video/geode/video_gx.h
+++ b/drivers/video/geode/video_gx.h
@@ -14,7 +14,7 @@
14extern struct geode_vid_ops gx_vid_ops; 14extern struct geode_vid_ops gx_vid_ops;
15 15
16/* GX Flatpanel control MSR */ 16/* GX Flatpanel control MSR */
17#define GX_VP_MSR_PAD_SELECT 0x2011 17#define GX_VP_MSR_PAD_SELECT 0xC0002011
18#define GX_VP_PAD_SELECT_MASK 0x3FFFFFFF 18#define GX_VP_PAD_SELECT_MASK 0x3FFFFFFF
19#define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF 19#define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF
20 20