Skip to content

Commit

Permalink
[PATCH] gxfb: Fixup flatpanel detection
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jordan Crouse authored and Linus Torvalds committed Dec 8, 2006
1 parent 16ef987 commit 53d53bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/video/geode/display_gx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/geode/gxfb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/geode/video_gx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 53d53bd

Please sign in to comment.