From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jordan Crouse" Subject: [PATCH 5/6] [PATCH] gxfb: Fixup flatpanel detection Date: Tue, 28 Nov 2006 16:15:17 -0700 Message-ID: <20061128231517.25769.43800.stgit@cosmic.amd.com> References: <20061128230639.25769.43.stgit@cosmic.amd.com> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1GpC4j-0004C9-GO for linux-fbdev-devel@lists.sourceforge.net; Tue, 28 Nov 2006 15:09:17 -0800 Received: from outbound-fra.frontbridge.com ([62.209.45.174] helo=outbound3-fra-R.bigfish.com) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1GpC4h-0001hA-Kn for linux-fbdev-devel@lists.sourceforge.net; Tue, 28 Nov 2006 15:09:17 -0800 In-Reply-To: <20061128230639.25769.43.stgit@cosmic.amd.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-fbdev-devel-bounces@lists.sourceforge.net Errors-To: linux-fbdev-devel-bounces@lists.sourceforge.net To: linux-fbdev-devel@lists.sourceforge.net, info-linux@ldcmail.amd.com Cc: akpm@osdl.org From: Jordan Crouse Use the right MSR and bits to detect if the GX is strapped for TFT or CRT Signed-off-by: Jordan Crouse --- drivers/video/geode/display_gx.h | 2 +- drivers/video/geode/gxfb_core.c | 2 +- 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 ba0ccc8..0af33f3 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 d404f56..83ab18a 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_ 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 8f1e85b..119d0ab 100644 --- a/drivers/video/geode/video_gx.h +++ b/drivers/video/geode/video_gx.h @@ -14,7 +14,7 @@ #define __VIDEO_GX_H__ 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 ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV