]> Pileus Git - ~andy/linux/commit
drm/i915: restore the early forcewake cleanup
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 16 Nov 2013 15:00:09 +0000 (16:00 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 17 Nov 2013 19:39:51 +0000 (20:39 +0100)
commitef46e0d247da0a7a408573aa15870e231bbd4af2
tree68e106d24f35f527260420bad57cc623dd28573b
parent29c78f609e661e663a239a37923adb1d61f6386c
drm/i915: restore the early forcewake cleanup

Some BIOS just leak the forcewak bits, which we clean up.
Unfortunately this has been broken in

commit 521198a2e7095c8c7daa8d7d3a76a110c346be6f
Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date:   Fri Aug 23 16:52:30 2013 +0300

    drm/i915: sanitize forcewake registers on reset

To make this work both for resets and for BIOS takeover just add the
forcewake clearing call back to intel_uncore_early_sanitize.

We need to clear the forcewake in early sanitize so that the forcewak
dance in intel_uncore_init (to figure out whether we have mt or legacy
forcewake on ivb) works. That cleanup fits in nicely with the general
topic of early_sanitize to prepare for the very first mmio ops.

Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reported-by: Jörg Otte <jrg.otte@gmail.com>
Cc: Jörg Otte <jrg.otte@gmail.com>
References: https://lkml.org/lkml/2013/11/16/40
Cc: stable@vger.kernel.org (for 3.12 only)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_uncore.c