From d072bccd74964406c2be12b0b30072805d9fb61e Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 8 Aug 2012 23:35:36 +0200 Subject: [PATCH] --- yaml --- r: 329281 b: refs/heads/master c: 35eb73234be6e7fa515c5f1b233ba33d030938cf h: refs/heads/master i: 329279: 5ca0ee28173465281b3ca3a612c382add590ab35 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 1 - trunk/drivers/gpu/drm/i915/intel_pm.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0941af60b1be..83bb750050c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6a828d3269a5d0b9adda1438cf8d7cb2007ca71 +refs/heads/master: 35eb73234be6e7fa515c5f1b233ba33d030938cf diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index 1614097f975a..261fe2175afb 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/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/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index e1439ae3556b..212b28e1b050 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/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();