diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-18 11:44:05 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-18 11:44:05 +0200 |
| commit | 5d0cf3d6e07957502dae8602e2f96eb6790ddc13 (patch) | |
| tree | 6360d831a14c8e3344dc60034c0458a151d591d6 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | drm/i915/chv: Ack interrupts before handling them (CHV) (diff) | |
| parent | drm/i915: make sure PC8 is enabled on suspend and disabled on resume v4 (diff) | |
| download | linux-dev-5d0cf3d6e07957502dae8602e2f96eb6790ddc13.tar.xz linux-dev-5d0cf3d6e07957502dae8602e2f96eb6790ddc13.zip | |
Merge branch 'topic/soix' into drm-intel-next-queued
Jesse's SOix work required some patches from acpi-next, so pull it in
through a topic barnch.
Conflicts:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 11cc7926ef98..29145df8ef64 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -316,7 +316,7 @@ static void gen6_force_wake_timer(unsigned long arg) intel_runtime_pm_put(dev_priv); } -static void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore) +void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore) { struct drm_i915_private *dev_priv = dev->dev_private; unsigned long irqflags; |