Mesa (master): r600g: fix logic error in 028987c80362eddd39176628486a456b076f0427

Alex Deucher agd5f at kemper.freedesktop.org
Mon Mar 14 22:08:08 UTC 2011


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

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Mar 14 18:07:15 2011 -0400

r600g: fix logic error in 028987c80362eddd39176628486a456b076f0427

Spotted by Henri on IRC.

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

---

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

diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index ff662a2..a7c2178 100644
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -764,7 +764,7 @@ static void rv6xx_context_surface_base_update(struct r600_context *ctx,
 					      unsigned base_update_flags)
 {
 	/* need to emit surface base update on rv6xx */
-	if ((ctx->radeon->family > CHIP_R600) ||
+	if ((ctx->radeon->family > CHIP_R600) &&
 	    (ctx->radeon->family < CHIP_RV770)) {
 		ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_SURFACE_BASE_UPDATE, 0, 0);
 		ctx->pm4[ctx->pm4_cdwords++] = base_update_flags;




More information about the mesa-commit mailing list