From: Eric Anholt <eric@anholt.net>
Date: Wed, 18 Jun 2008 21:07:38 +0000 (-0700)
Subject: Merge commit 'origin/master' into drm-gem
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=654258a4fe5e7114022c6e02f2844fc469fcc6f3;p=mesa.git

Merge commit 'origin/master' into drm-gem
---

654258a4fe5e7114022c6e02f2844fc469fcc6f3
diff --cc src/mesa/drivers/dri/intel/intel_blit.c
index 174f5ecab02,414300c5497..f1f21e7dfea
--- a/src/mesa/drivers/dri/intel/intel_blit.c
+++ b/src/mesa/drivers/dri/intel/intel_blit.c
@@@ -362,11 -356,10 +359,11 @@@ intelEmitCopyBlit(struct intel_context 
  
        BEGIN_BATCH(8, NO_LOOP_CLIPRECTS);
        OUT_BATCH(CMD);
-       OUT_BATCH(BR13 | dst_pitch);
+       OUT_BATCH(BR13 | ((uint16_t)dst_pitch));
        OUT_BATCH((0 << 16) | dst_x);
        OUT_BATCH((h << 16) | dst_x2);
 -      OUT_RELOC(dst_buffer, DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_WRITE,
 +      OUT_RELOC(dst_buffer,
 +		I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,
  		dst_offset + dst_y * dst_pitch);
        OUT_BATCH((0 << 16) | src_x);
        OUT_BATCH(src_pitch);