From 7f5925d57c1405ff40acb2fd40b41ab4f189f7a4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airliedfreedesktop.org>
Date: Wed, 3 Aug 2005 10:22:31 +0000
Subject: Add color tiling support to miniglx for radeon (Stephane Marchesin +
 Dave Airlie)

---
 src/glx/mini/driver.h             | 2 ++
 src/glx/mini/example.miniglx.conf | 4 ++++
 src/glx/mini/miniglx.c            | 4 ++++
 3 files changed, 10 insertions(+)

(limited to 'src/glx')

diff --git a/src/glx/mini/driver.h b/src/glx/mini/driver.h
index 6ce339d98d..27402641b7 100644
--- a/src/glx/mini/driver.h
+++ b/src/glx/mini/driver.h
@@ -68,6 +68,8 @@ typedef struct DRIDriverContextRec {
    int cpp;  
    int agpmode;
    int isPCI;
+   
+   int colorTiling;	    /**< \brief color tiling is enabled */
 
    unsigned long FBStart;   /**< \brief physical address of the framebuffer */
    unsigned long MMIOStart; /**< \brief physical address of the MMIO region */
diff --git a/src/glx/mini/example.miniglx.conf b/src/glx/mini/example.miniglx.conf
index 1f39f7958b..62dd4f65ec 100644
--- a/src/glx/mini/example.miniglx.conf
+++ b/src/glx/mini/example.miniglx.conf
@@ -30,3 +30,7 @@ agpmode=1
 
 # Rotated monitor? -- NOTE: only works with subsetted radeon driver!
 rotateMode=0
+
+# Do we want to use color tiling ?
+colorTiling=0
+
diff --git a/src/glx/mini/miniglx.c b/src/glx/mini/miniglx.c
index c3001e9765..1dd21bd1f0 100644
--- a/src/glx/mini/miniglx.c
+++ b/src/glx/mini/miniglx.c
@@ -878,6 +878,7 @@ static int __read_config_file( Display *dpy )
    dpy->rotateMode = 0;
    dpy->driverContext.agpmode = 1;
    dpy->driverContext.isPCI = 0;
+   dpy->driverContext.colorTiling = 0;
 
    fname = getenv("MINIGLX_CONF");
    if (!fname) fname = "/etc/miniglx.conf";
@@ -950,6 +951,9 @@ static int __read_config_file( Display *dpy )
       else if (strcmp(opt, "isPCI") == 0) {
 	 dpy->driverContext.isPCI = atoi(val) ? 1 : 0;
       }
+      else if (strcmp(opt, "colorTiling") == 0) {
+	 dpy->driverContext.colorTiling = atoi(val) ? 1 : 0;
+      }
    }
 
    fclose(file);
-- 
cgit v1.2.3