drm/i915: Silence a few -Wunused-but-set-variable

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cf4f74c7c6fb..a70caf8b2688 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1121,7 +1121,6 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_mmap *args = data;
         struct drm_gem_object *obj;
-        loff_t offset;
         unsigned long addr;
 
         if (!(dev->driver->driver_features & DRIVER_GEM))
@@ -1136,8 +1135,6 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
                 return -E2BIG;
         }
 
-        offset = args->offset;
-
         down_write(&current->mm->mmap_sem);
         addr = do_mmap(obj->filp, 0, args->size,
                        PROT_READ | PROT_WRITE, MAP_SHARED,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 36958fdabdce..2fbc3da06c29 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4346,7 +4346,7 @@ static void intel_update_watermarks(struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_crtc *crtc;
         int sr_hdisplay = 0;
-        unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
+        unsigned long planea_clock = 0, planeb_clock = 0;
         int enabled = 0, pixel_size = 0;
         int sr_htotal = 0;
 
@@ -4368,7 +4368,6 @@ static void intel_update_watermarks(struct drm_device *dev)
                                 planeb_clock = crtc->mode.clock;
                         }
                         sr_hdisplay = crtc->mode.hdisplay;
-                        sr_clock = crtc->mode.clock;
                         sr_htotal = crtc->mode.htotal;
                         if (crtc->fb)
                                 pixel_size = crtc->fb->bits_per_pixel / 8;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index cacc89f22621..5f7bbaa6a608 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -893,6 +893,10 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring)
         /* Disable the ring buffer. The ring must be idle at this point */
         dev_priv = ring->dev->dev_private;
         ret = intel_wait_ring_buffer(ring, ring->size - 8);
+        if (ret)
+                DRM_ERROR("failed to quiesce %s whilst cleaning up: %d\n",
+                          ring->name, ret);
+
         I915_WRITE_CTL(ring, 0);
 
         drm_core_ioremapfree(&ring->map, ring->dev);