From a594dcd9b039c3113dbfbbb3b2840586e53ef61f Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 30 Jan 2013 15:59:57 +0100 Subject: [PATCH] --- yaml --- r: 358073 b: refs/heads/master c: 6b25a88752e8e9dc33c700712059b094d3da3219 h: refs/heads/master i: 358071: 5057e03ac4094649fff512cf1b15d13f7c7fa499 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1bace5f0e317..c5a434dc05a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 725a5b54028916cd2511a251c5b5b13d1715addc +refs/heads/master: 6b25a88752e8e9dc33c700712059b094d3da3219 diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index 64d65f564a7c..bec1f9ffba2d 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/drivers/gpu/drm/i915/intel_pm.c @@ -4088,8 +4088,6 @@ void intel_init_power_well(struct drm_device *dev) if (!IS_HASWELL(dev)) return; - mutex_lock(&dev->struct_mutex); - /* For now, we need the power well to be always enabled. */ intel_set_power_well(dev, true); @@ -4097,8 +4095,6 @@ void intel_init_power_well(struct drm_device *dev) * the driver is in charge now. */ if (I915_READ(HSW_PWR_WELL_BIOS) & HSW_PWR_WELL_ENABLE) I915_WRITE(HSW_PWR_WELL_BIOS, 0); - - mutex_unlock(&dev->struct_mutex); } /* Set up chip specific power management-related functions */