diff options
author | Andrew Morton <akpm@osdl.org> | 2006-08-15 19:15:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-09-21 15:32:32 -0400 |
commit | 78eca43d0391f59c3b1505bb7bd38ff45b650aab (patch) | |
tree | 9d2b2fb545e115bd8d2264a7598141c4e4a82382 /drivers/char/drm/i915_dma.c | |
parent | a1d0fcf5a1cf56ae4711c7e0f857832724a67e8b (diff) |
drm: fix i965 build bug
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_dma.c')
-rw-r--r-- | drivers/char/drm/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
404 | BEGIN_LP_RING(4); | 404 | BEGIN_LP_RING(4); |
405 | OUT_RING(GFX_OP_DRAWRECT_INFO_I965); | 405 | OUT_RING(GFX_OP_DRAWRECT_INFO_I965); |
406 | OUT_RING((box.x1 & 0xffff) | (box.y1 << 16)); | 406 | OUT_RING((box.x1 & 0xffff) | (box.y1 << 16)); |
407 | OUT_RING(((box.x2 - 1) & 0xffff) ((box.y2 - 1) << 16)); | 407 | OUT_RING(((box.x2 - 1) & 0xffff) | ((box.y2 - 1) << 16)); |
408 | OUT_RING(DR4); | 408 | OUT_RING(DR4); |
409 | ADVANCE_LP_RING(); | 409 | ADVANCE_LP_RING(); |
410 | } else { | 410 | } else { |