summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-05-01 11:44:13 -0700
committerCarl Worth <cworth@cworth.org>2009-05-06 09:12:25 -0700
commit115fc9a7d79da07301b96d9fc5c513d33734d273 (patch)
tree98e87f2f5d8cbbb192e4e68b3d862b13b27f62a3
parent296a986e5258e2fd13ec494071b7063bd639cd68 (diff)
downloadxf86-video-intel-frc-115fc9a7d79da07301b96d9fc5c513d33734d273.tar.gz
xf86-video-intel-frc-115fc9a7d79da07301b96d9fc5c513d33734d273.tar.bz2
intel_batch_start_atomic: fix size passed to intel_batch_require_space (*4)
intel_batch_start_atomic takes an argument in 32-bit units, and so it must multiply that by 4 before passing it to intel_batch_require_space, which takes an argument in bytes. We should figure out what units we want to use and use the same everywhere... Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 1142353b487c155a31011923fbd08ec67e60f505)
-rw-r--r--src/i830_batchbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index a72786e5..ec870847 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -56,7 +56,7 @@ intel_batch_start_atomic(ScrnInfoPtr pScrn, unsigned int sz)
I830Ptr pI830 = I830PTR(pScrn);
assert(!pI830->in_batch_atomic);
- intel_batch_require_space(pScrn, pI830, sz);
+ intel_batch_require_space(pScrn, pI830, sz * 4);
pI830->in_batch_atomic = TRUE;
pI830->batch_atomic_limit = pI830->batch_used + sz * 4;