提交 53d53bd4 编写于 作者: J Jordan Crouse 提交者: Linus Torvalds

[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: NJordan Crouse <jordan.crouse@amd.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Acked-by: NJames Simmons <jsimmons@infradead.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 16ef9870
...@@ -18,7 +18,7 @@ extern struct geode_dc_ops gx_dc_ops; ...@@ -18,7 +18,7 @@ extern struct geode_dc_ops gx_dc_ops;
/* MSR that tells us if a TFT or CRT is attached */ /* MSR that tells us if a TFT or CRT is attached */
#define GLD_MSR_CONFIG 0xC0002001 #define GLD_MSR_CONFIG 0xC0002001
#define GLD_MSR_CONFIG_FMT_FP 0x01 #define GLD_MSR_CONFIG_DM_FP 0x40
/* Display controller registers */ /* Display controller registers */
......
...@@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i ...@@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
rdmsrl(GLD_MSR_CONFIG, val); 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; par->enable_crt = 0;
else else
par->enable_crt = 1; par->enable_crt = 1;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
extern struct geode_vid_ops gx_vid_ops; extern struct geode_vid_ops gx_vid_ops;
/* GX Flatpanel control MSR */ /* 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_MASK 0x3FFFFFFF
#define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF #define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册