---

yaml --- r: 37508 b: refs/heads/master c: 78eca43 h: refs/heads/master v: v3
git-mirror · Sep 21, 2006 · 0462f50 · 0462f50
1 parent e4c7817
commit 0462f50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1d0fcf5a1cf56ae4711c7e0f857832724a67e8b
+refs/heads/master: 78eca43d0391f59c3b1505bb7bd38ff45b650aab
diff --git a/trunk/drivers/char/drm/i915_dma.c b/trunk/drivers/char/drm/i915_dma.c
@@ -404,7 +404,7 @@ static int i915_emit_box(drm_device_t * dev,
 		BEGIN_LP_RING(4);
 		OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
 		OUT_RING((box.x1 & 0xffff) | (box.y1 << 16));
-		OUT_RING(((box.x2 - 1) & 0xffff) ((box.y2 - 1) << 16));
+		OUT_RING(((box.x2 - 1) & 0xffff) | ((box.y2 - 1) << 16));
 		OUT_RING(DR4);
 		ADVANCE_LP_RING();
 	} else {