summaryrefslogtreecommitdiff
path: root/src/savage_exa.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2006-12-11 13:16:53 -0800
committerIan Romanick <idr@us.ibm.com>2006-12-11 13:16:53 -0800
commit36c444e80324c82f7d02d9d95372123c923336a0 (patch)
tree1989fec6bbe1d5546e431ca774441aa2550c10bc /src/savage_exa.c
parentf2191d412832312b494f313841d094f87f64a5ff (diff)
parente361a9523394a2f0558f7d2648bf6a43ebe31f2e (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-savage into pci-rework
Conflicts: src/savage_driver.c
Diffstat (limited to 'src/savage_exa.c')
-rw-r--r--src/savage_exa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/savage_exa.c b/src/savage_exa.c
index 942fe86..8e6da38 100644
--- a/src/savage_exa.c
+++ b/src/savage_exa.c
@@ -431,13 +431,14 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int
/*ErrorF("in UTS\n");*/
- psav->WaitQueue(psav, 5);
+ psav->WaitQueue(psav, 6);
BCI_SEND(cmd);
/* dst */
BCI_SEND(psav->sbd_offset);
BCI_SEND(psav->sbd_high);
+ BCI_SEND(BCI_CLIP_LR(x, x+w-1));
BCI_SEND(BCI_X_Y(x, y));
BCI_SEND(BCI_W_H(w, h));