From: Andrew Morton <akpm@osdl.org>
Date: Tue, 15 Aug 2006 23:15:51 +0000 (+1000)
Subject: drm: fix i965 build bug
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=78eca43d0391f59c3b1505bb7bd38ff45b650aab;p=deliverable%2Flinux.git

drm: fix i965 build bug

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 99e9d07409e4..d932f80f264c 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/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 {