drm/i915: kill dev_priv->mchdev_lock

It's only ever a pointer to the global mchdev_lock, and we don't use
it at all.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1614097f975a0379827748bcaacbafb13f4a0ac1..261fe2175afbc733aa9b37436163331f5c29b45e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -850,7 +850,6 @@ typedef struct drm_i915_private {
        int c_m;
        int r_t;
        u8 corr;
-       spinlock_t *mchdev_lock;
 
        enum no_fbc_reason no_fbc_reason;
 

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index e1439ae3556b0d8ef5d183a032e37159cc22c73a..212b28e1b05039acd69ff64bcbb441f28513367e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3188,7 +3188,6 @@ void intel_gpu_ips_init(struct drm_i915_private *dev_priv)
         * set up, to avoid intel-ips sneaking in and reading bogus values. */
        spin_lock(&mchdev_lock);
        i915_mch_dev = dev_priv;
-       dev_priv->mchdev_lock = &mchdev_lock;
        spin_unlock(&mchdev_lock);
 
        ips_ping_for_i915_load();