summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2011-01-06 09:55:41 +0100
committerJeremy Huddleston <jeremyhu@apple.com>2011-01-06 11:58:44 -0800
commit30fe77d923dda00744df6f460ca34642335b8530 (patch)
tree32483a0e9d748cd28d44246b3669203d6268c7ab
parent96cf8a77ac067dc9b1958a7f577d22904610c86f (diff)
EXA: Pad size of system memory copy for 1x1 pixmaps (bug #32803).
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=32803 . Signed-off-by: Michel Dänzer <daenzer@vmware.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 6358a60065eef167d4e5f4afd981ff26deeba80d)
-rw-r--r--exa/exa_mixed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 21cc3bd13..fd752f45c 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -98,7 +98,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
pExaPixmap->use_gpu_copy = FALSE;
if (w == 1 && h == 1) {
- pExaPixmap->sys_ptr = malloc((pPixmap->drawable.bitsPerPixel + 7) / 8);
+ pExaPixmap->sys_ptr = malloc(paddedWidth);
/* Set up damage tracking */
pExaPixmap->pDamage = DamageCreate(exaDamageReport_mixed, NULL,