From 5f179e796d1cd310790d06eebb474ad67114ec84 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Wed, 3 Mar 2004 12:12:18 +0000
Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004

---
 src/aticonfig.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/aticonfig.c')

diff --git a/src/aticonfig.c b/src/aticonfig.c
index e1f595b5..cee9e180 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c,v 1.15 2004/01/05 16:42:01 tsi Exp $*/
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c,v 1.15tsi Exp $*/
 /*
  * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -34,6 +34,7 @@
  */
 typedef enum
 {
+    ATI_OPTION_BIOS_DISPLAY,    /* Allow BIOS interference */
     ATI_OPTION_CRT_SCREEN,      /* Legacy negation of "PanelDisplay" */
     ATI_OPTION_DEVEL,           /* Intentionally undocumented */
     ATI_OPTION_BLEND,           /* Force horizontal blending of small modes */
@@ -56,6 +57,13 @@ ATIProcessOptions
     OptionInfoPtr PublicOption = xnfalloc(ATIPublicOptionSize);
     OptionInfoRec PrivateOption[] =
     {
+        {                       /* ON:  Let BIOS change display(s) */
+            ATI_OPTION_BIOS_DISPLAY,    /* OFF:  Don't */
+            "biosdisplay",
+            OPTV_BOOLEAN,
+            {0, },
+            FALSE
+        },
         {                       /* Negation of "PanelDisplay" public option */
             ATI_OPTION_CRT_SCREEN,
             "crtscreen",
@@ -63,6 +71,13 @@ ATIProcessOptions
             {0, },
             FALSE
         },
+        {                       /* ON:   Ease exploration of loose ends */
+            ATI_OPTION_DEVEL,   /* OFF:  Fit for public consumption */
+            "tsi",
+            OPTV_BOOLEAN,
+            {0, },
+            FALSE
+        },
         {                       /* ON:   Horizontally blend most modes */
             ATI_OPTION_BLEND,   /* OFF:  Use pixel replication more often */
             "lcdblend",
@@ -77,13 +92,6 @@ ATIProcessOptions
             {0, },
             FALSE
         },
-        {                       /* ON:   Ease exploration of loose ends */
-            ATI_OPTION_DEVEL,   /* OFF:  Fit for public consumption */
-            "tsi",
-            OPTV_BOOLEAN,
-            {0, },
-            FALSE
-        },
         {
             -1,
             NULL,
@@ -96,6 +104,7 @@ ATIProcessOptions
     (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize);
 
 #   define Accel         PublicOption[ATI_OPTION_ACCEL].value.bool
+#   define BIOSDisplay   PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool
 #   define Blend         PrivateOption[ATI_OPTION_BLEND].value.bool
 #   define CRTDisplay    PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool
 #   define CRTScreen     PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool
@@ -176,6 +185,7 @@ ATIProcessOptions
 
     /* Move option values into driver private structure */
     pATI->OptionAccel = Accel;
+    pATI->OptionBIOSDisplay = BIOSDisplay;
     pATI->OptionBlend = Blend;
     pATI->OptionCRTDisplay = CRTDisplay;
     pATI->OptionCSync = CSync;
-- 
cgit v1.2.3