Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53d53bd4 authored by Jordan Crouse's avatar Jordan Crouse Committed by Linus Torvalds
Browse files

[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: default avatarJordan Crouse <jordan.crouse@amd.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Acked-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 16ef9870

drivers/video/geode/display_gx.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/video/geode/gxfb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/video/geode/video_gx.h

+1 −1
Original line number Diff line number Diff line
@@ -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