aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e378204970fd..f194603140c0 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1828,7 +1828,6 @@ i915_wait_request(struct intel_ring_buffer *ring,
1828 uint32_t seqno) 1828 uint32_t seqno)
1829{ 1829{
1830 drm_i915_private_t *dev_priv = ring->dev->dev_private; 1830 drm_i915_private_t *dev_priv = ring->dev->dev_private;
1831 u32 ier;
1832 int ret = 0; 1831 int ret = 0;
1833 1832
1834 BUG_ON(seqno == 0); 1833 BUG_ON(seqno == 0);
@@ -1863,19 +1862,6 @@ i915_wait_request(struct intel_ring_buffer *ring,
1863 } 1862 }
1864 1863
1865 if (!i915_seqno_passed(ring->get_seqno(ring), seqno)) { 1864 if (!i915_seqno_passed(ring->get_seqno(ring), seqno)) {
1866 if (HAS_PCH_SPLIT(ring->dev))
1867 ier = I915_READ(DEIER) | I915_READ(GTIER);
1868 else if (IS_VALLEYVIEW(ring->dev))
1869 ier = I915_READ(GTIER) | I915_READ(VLV_IER);
1870 else
1871 ier = I915_READ(IER);
1872 if (!ier) {
1873 DRM_ERROR("something (likely vbetool) disabled "
1874 "interrupts, re-enabling\n");
1875 ring->dev->driver->irq_preinstall(ring->dev);
1876 ring->dev->driver->irq_postinstall(ring->dev);
1877 }
1878
1879 trace_i915_gem_request_wait_begin(ring, seqno); 1865 trace_i915_gem_request_wait_begin(ring, seqno);
1880 1866
1881 ring->waiting_seqno = seqno; 1867 ring->waiting_seqno = seqno;