xf86-video-intel: Branch 'modesetting' - 2 commits - src/i915_video.c

[Keith Packard]

 src/i915_video.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b00951a5c87ca8c596ee9cc73d96d598eec60751 (from parents)
Merge: 05cd921140fae2746c3421715d7f18248a66735a c0a0ddc0ce69b60ac3a58d45cb32ccd0e0bfb0c9
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Dec 19 16:22:04 2006 -0800

    Merge branch 'modesetting-origin' into modesetting

diff-tree 05cd921140fae2746c3421715d7f18248a66735a (from 3c86fdda1d09fd22d4c15a8e412611db4cea7dcf)
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Dec 19 16:21:46 2006 -0800

    Align textured video dither matrix to window

diff --git a/src/i915_video.c b/src/i915_video.c
index c2f0184..636b2cb 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -103,7 +103,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pSc
 
    /* draw rect -- just clipping */
    OUT_RING(_3DSTATE_DRAW_RECT_CMD);
-   OUT_RING(DRAW_DITHER_OFS_X(x1 & 3)| DRAW_DITHER_OFS_Y(y1 & 3)); /* flags */
+   OUT_RING(DRAW_DITHER_OFS_X(pDraw->x & 3)| DRAW_DITHER_OFS_Y(pDraw->y & 3)); /* flags */
    OUT_RING(0x00000000);	/* ymin, xmin */
    OUT_RING((pScrn->virtualX - 1) |
 	    (pScrn->virtualY - 1) << 16); /* ymax, xmax */