From cb69ce0f54569c68c79173e144c3c90e46e64f8b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon, 8 Jan 2007 15:23:59 -0500
Subject: Minor DCON fixes.

Wire up the DCON init to GXPreInit, and set the panel geometry appropriately
if found.
---
 src/amd_gx_driver.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/amd_gx_driver.c')

diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c
index df919ed..7eac3a3 100644
--- a/src/amd_gx_driver.c
+++ b/src/amd_gx_driver.c
@@ -651,7 +651,9 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 
     /* Set up the panel */
 
-    if (pGeode->Panel) {
+    if (gx_dcon_init(pScrni)) {
+	pGeode->Panel = TRUE;
+    } else if (pGeode->Panel) {
 	if (panelgeo != NULL) {
 	    if (GXGetFPInfo(panelgeo, &pGeode->FPBX, &pGeode->FPBY))
 		pGeode->Panel = FALSE;
-- 
cgit v1.2.3