Mesa (mesa_7_7_branch): radeon: fix bug in realloc code.

Dave Airlie airlied at kemper.freedesktop.org
Mon Jan 11 03:27:40 UTC 2010


Module: Mesa
Branch: mesa_7_7_branch
Commit: 1294df9ca4ec39f00de3f9d923316f6641c1fb4a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1294df9ca4ec39f00de3f9d923316f6641c1fb4a

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 11 13:21:02 2010 +1000

radeon: fix bug in realloc code.

This bug was fixed in libdrm ages ago, port to non-kms

---

 src/mesa/drivers/dri/radeon/radeon_cs_legacy.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
index 45b608a..bf46eb8 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
@@ -182,7 +182,7 @@ static int cs_begin(struct radeon_cs_int *cs,
         uint32_t tmp, *ptr;
 	int num = (ndw > 0x3FF) ? ndw : 0x3FF;
 
-        tmp = (cs->cdw + 1 + num) & (~num);
+        tmp = (cs->cdw + ndw + 0x3ff) & (~0x3ff);
         ptr = (uint32_t*)realloc(cs->packets, 4 * tmp);
         if (ptr == NULL) {
             return -ENOMEM;




More information about the mesa-commit mailing list