Merge tag 'drm-intel-next-fixes-2018-08-16-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

Fixes for:
- DP full color range.
- selftest for gem_object
- forcewake on suspend
- GPU reset

This also include accumulated fixes from GVT:
- Fix an error code in gvt_dma_map_page() (Dan)
- Fix off by one error in intel_vgpu_write_fence() (Dan)
- Fix potential Spectre v1 (Gustavo)
- Fix workload free in vgpu release (Henry)
- Fix cleanup sequence in intel_gvt_clean_device (Henry)
- dmabuf mutex init place fix (Henry)
- possible memory leak in intel_vgpu_ioctl() err path (Yi)
- return error on cmd access check failure (Yan)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180816190335.GA7765@intel.com

1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 33faad3197fe..6a8f27d0a742 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -387,8 +387,18 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
                 mmio = RING_HWS_PGA(engine->mmio_base);
         }
 
-        if (INTEL_GEN(dev_priv) >= 6)
-                I915_WRITE(RING_HWSTAM(engine->mmio_base), 0xffffffff);
+        if (INTEL_GEN(dev_priv) >= 6) {
+                u32 mask = ~0u;
+
+                /*
+                 * Keep the render interrupt unmasked as this papers over
+                 * lost interrupts following a reset.
+                 */
+                if (engine->id == RCS)
+                        mask &= ~BIT(0);
+
+                I915_WRITE(RING_HWSTAM(engine->mmio_base), mask);
+        }
 
         I915_WRITE(mmio, engine->status_page.ggtt_offset);
         POSTING_READ(mmio);