Commit 05efeebd authored Mar 18, 2014 by Daniel Vetter

drm/i915: Fix up the forcewake timer initialization



This is a regression introduced in

commit 0294ae7b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Mar 13 12:00:29 2014 +0000

    drm/i915: Consolidate forcewake resetting to a single function

The reordered setup sequence ended up calling del_timer_sync before
the timer was set up correctly, resulting in endless hilarity when
loading the driver.

Compared to Ben's patch (which moved around the setup_timer call to
sanitize_early) this moves the sanitize_early call around in the
driver load call. This way we avoid calling setup_timer again in the
resume code (where we also call sanitize_early).

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Tested-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76242


Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 0294ae7b

drivers/gpu/drm/i915/i915_dma.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1608,8 +1608,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
		goto put_bridge;
		}

		intel_uncore_early_sanitize(dev);

		/* This must be called before any calls to HAS_PCH_* */
		intel_detect_pch(dev);

drivers/gpu/drm/i915/intel_uncore.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -727,6 +727,8 @@ void intel_uncore_init(struct drm_device *dev)
		setup_timer(&dev_priv->uncore.force_wake_timer,
		gen6_force_wake_timer, (unsigned long)dev_priv);

		intel_uncore_early_sanitize(dev);

		if (IS_VALLEYVIEW(dev)) {
		dev_priv->uncore.funcs.force_wake_get = __vlv_force_wake_get;
		dev_priv->uncore.funcs.force_wake_put = __vlv_force_wake_put;