summaryrefslogtreecommitdiff
path: root/src/i830_exa.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-05-17 23:26:14 -0700
committerKeith Packard <keithp@keithp.com>2008-05-17 23:26:14 -0700
commitc81050c0058e32098259b5078515807038beb7d6 (patch)
tree3cfdef0013b7d826f59e3747bd55d43b638336fe /src/i830_exa.c
parent9c9a5d0e48c6e911574695fc417d2dc1a0fd1c20 (diff)
parente9532f3abf1e0b62b2569d4aae60a5a63add571f (diff)
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/i830_exa.c')
-rw-r--r--src/i830_exa.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 9b5bb936..2c807c51 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -170,6 +170,8 @@ I830EXAPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
if (pPixmap->drawable.bitsPerPixel == 24)
I830FALLBACK("solid 24bpp unsupported!\n");
+ i830_exa_check_pitch_2d(pPixmap);
+
offset = exaGetPixmapOffset(pPixmap);
pitch = exaGetPixmapPitch(pPixmap);
@@ -255,6 +257,9 @@ I830EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
if (!EXA_PM_IS_SOLID(&pSrcPixmap->drawable, planemask))
I830FALLBACK("planemask is not solid");
+ i830_exa_check_pitch_2d(pSrcPixmap);
+ i830_exa_check_pitch_2d(pDstPixmap);
+
pI830->pSrcPixmap = pSrcPixmap;
pI830->BR[13] = I830CopyROP[alu] << 16;