Merge commit 'origin/master' into drm-gem

diff --cc src/mesa/drivers/dri/Makefile.template
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_blit.c
index 174f5ecab024407eccbfac987cda0aef5fa87b0d,414300c549784c8ba8be8fefaf65ccdfe3b656f3..f1f21e7dfea5ac92bbceef84369f1e82186ceb51
--- 1/src/mesa/drivers/dri/intel/intel_blit.c
--- 2/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);

diff --cc src/mesa/drivers/dri/intel/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_screen.c
Simple merge