Skip to content

Commit

Permalink
drm/i915: kill cargo-culted locking from power well code
Browse files Browse the repository at this point in the history
We may not concurrently change the power wells code. Which
is already guaranteed since modesets aren't concurrent. That
leaves races against setup/teardown/suspend/resume, and for
those we already (try) rather hard not to hit concurrent
modesets.

No debug WARN_ON added since that would require us to grab the
modeset locks in init/suspend code. Which is again just cargo
culting since just grabbing the locks in those paths isn't good
enough, we need the right order of operations, too.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Jan 31, 2013
1 parent 725a5b5 commit 6b25a88
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/gpu/drm/i915/intel_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -4088,17 +4088,13 @@ 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);

/* We're taking over the BIOS, so clear any requests made by it since
* 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 */
Expand Down

0 comments on commit 6b25a88

Please sign in to comment.