From: Dave Airlie <airlied@redhat.com>
Date: Fri, 16 Oct 2015 00:10:32 +0000 (+1000)
Subject: Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub... 
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=48f87dd146a480c723774962eca675873a8aa1da;p=deliverable%2Flinux.git

Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git./linux/kernel/git/torvalds/linux into drm-next

Backmerge the drm-fixes pull from Linus's tree into drm-next.

This is to fix some conflicts and make future pulls cleaner
---

48f87dd146a480c723774962eca675873a8aa1da
diff --cc drivers/gpu/drm/drm_fb_helper.c
index abe9793d548d,ca08c472311b..bd6d4ab27512
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@@ -442,10 -345,14 +442,14 @@@ static int restore_fbdev_mode(struct dr
  		struct drm_crtc *crtc = mode_set->crtc;
  		int ret;
  
- 		if (crtc->funcs->cursor_set) {
+ 		if (crtc->funcs->cursor_set2) {
+ 			ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0);
+ 			if (ret)
 -				error = true;
++				return ret;
+ 		} else if (crtc->funcs->cursor_set) {
  			ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
  			if (ret)
 -				error = true;
 +				return ret;
  		}
  
  		ret = drm_mode_set_config_internal(mode_set);
diff --cc drivers/gpu/drm/i915/intel_lrc.c
index 256167b2e2ab,7412caedcf7f..825fa7a8df86
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@@ -519,8 -492,10 +519,8 @@@ void intel_lrc_irq_handler(struct intel
  
  	while (read_pointer < write_pointer) {
  		read_pointer++;
- 		status = I915_READ(RING_CONTEXT_STATUS_BUF_LO(ring, read_pointer % 6));
- 		status_id = I915_READ(RING_CONTEXT_STATUS_BUF_HI(ring, read_pointer % 6));
 -		status = I915_READ(RING_CONTEXT_STATUS_BUF(ring) +
 -				(read_pointer % GEN8_CSB_ENTRIES) * 8);
 -		status_id = I915_READ(RING_CONTEXT_STATUS_BUF(ring) +
 -				(read_pointer % GEN8_CSB_ENTRIES) * 8 + 4);
++		status = I915_READ(RING_CONTEXT_STATUS_BUF_LO(ring, read_pointer % GEN8_CSB_ENTRIES));
++		status_id = I915_READ(RING_CONTEXT_STATUS_BUF_HI(ring, read_pointer % GEN8_CSB_ENTRIES));
  
  		if (status & GEN8_CTX_STATUS_IDLE_ACTIVE)
  			continue;
@@@ -1477,10 -1424,8 +1479,11 @@@ static int gen8_init_common_ring(struc
  {
  	struct drm_device *dev = ring->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
+ 	u8 next_context_status_buffer_hw;
  
 +	lrc_setup_hardware_status_page(ring,
 +				ring->default_context->engine[ring->id].state);
 +
  	I915_WRITE_IMR(ring, ~(ring->irq_enable_mask | ring->irq_keep_mask));
  	I915_WRITE(RING_HWSTAM(ring->mmio_base), 0xffffffff);