From: Aapo Tahkola <aet@rasterburn.org>
Date: Tue, 21 Jun 2005 15:41:03 +0000 (+0000)
Subject: r300 driver side of color tiling support.
X-Git-Tag: 062012170305~22430
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebd99043edab8297aafdf8dde6084e15c4a009c3;p=profile%2Fivi%2Fmesa.git

r300 driver side of color tiling support.
---

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 8d752f9..255f17a 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -130,6 +130,9 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer)
 	else
 		cbpitch |= R300_COLOR_FORMAT_RGB565;
 	
+	if (r300->radeon.sarea->tiling_enabled)
+		cbpitch |= R300_COLOR_TILE_ENABLE;
+	
 	R300_STATECHANGE(r300, cb);
 	r300->hw.cb.cmd[R300_CB_OFFSET] = cboffset;
 	r300->hw.cb.cmd[R300_CB_PITCH] = cbpitch;
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index d8feb19..68aeb5e 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2160,6 +2160,9 @@ void r300ResetHwState(r300ContextPtr r300)
 	else
 		r300->hw.cb.cmd[R300_CB_PITCH] |= R300_COLOR_FORMAT_RGB565;
 	
+	if (r300->radeon.sarea->tiling_enabled)
+		r300->hw.cb.cmd[R300_CB_PITCH] |= R300_COLOR_TILE_ENABLE;
+	
 	r300->hw.unk4E50.cmd[1] = 0;
 	r300->hw.unk4E50.cmd[2] = 0;
 	r300->hw.unk4E50.cmd[3] = 0;
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.c b/src/mesa/drivers/dri/r300/radeon_screen.c
index 394b6b0..dea0d21 100644
--- a/src/mesa/drivers/dri/r300/radeon_screen.c
+++ b/src/mesa/drivers/dri/r300/radeon_screen.c
@@ -833,11 +833,11 @@ void *__driCreateNewScreen(__DRInativeDisplay * dpy, int scrn,
 			   __GLcontextModes ** driver_modes)
 {
 	__DRIscreenPrivate *psp;
-	static const __DRIversion ddx_expected = { 4, 0, 0 };
+	static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
 	static const __DRIversion dri_expected = { 4, 0, 0 };
 	static const __DRIversion drm_expected = { 1, 11, 1 };
 
-	if (!driCheckDriDdxDrmVersions2("R300",
+	if (!driCheckDriDdxDrmVersions3("R300",
 					dri_version, &dri_expected,
 					ddx_version, &ddx_expected,
 					drm_version, &drm_expected)) {