Mesa (master): r600g: fix eg OQ properly.

Dave Airlie airlied at kemper.freedesktop.org
Mon Jan 31 10:41:24 UTC 2011


Module: Mesa
Branch: master
Commit: ea5ede2178b75cc52df73d873946657fce9d4705
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea5ede2178b75cc52df73d873946657fce9d4705

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 31 20:44:47 2011 +1000

r600g: fix eg OQ properly.

the context init is separate for these gpus.

---

 src/gallium/winsys/r600/drm/evergreen_hw_context.c |    2 ++
 src/gallium/winsys/r600/drm/r600_hw_context.c      |    6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
index 3fdafc3..aa4035a 100644
--- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c
+++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
@@ -621,6 +621,8 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon)
 	/* save 16dwords space for fence mecanism */
 	ctx->pm4_ndwords -= 16;
 
+	ctx->max_db = 8;
+
 	LIST_INITHEAD(&ctx->fenced_bo);
 
 	/* init dirty list */
diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index f4e2aaa..a939ec6 100644
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -752,11 +752,7 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon)
 	/* init dirty list */
 	LIST_INITHEAD(&ctx->dirty);
 
-	/* TODO update this value correctly */
-	if (radeon->family >= CHIP_CEDAR)
-		ctx->max_db = 8;
-	else
-		ctx->max_db = 4;
+	ctx->max_db = 4;
 
 	return 0;
 out_err:




More information about the mesa-commit mailing list