From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date: Fri, 27 Feb 2015 16:11:09 +0000 (+0200)
Subject: drm/i915: Do both mt and gen6 style forcewake reset on ivb probe
X-Git-Tag: omap-for-v4.2/o2_dc~72^2~24^2~65
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ea2556f3e2549284331a3a29a5984f859c3cd5b;p=pandora-kernel.git

drm/i915: Do both mt and gen6 style forcewake reset on ivb probe

commit 05a2fb157e44 ("drm/i915: Consolidate forcewake code")
failed to take into account that we have used to reset both
the gen6 style and the multithreaded style forcewake registers.
This is due to fact that ivb can use either, depending on how the
bios has set up the machine.

Mimic the old semantics before we have determined the correct variety
and reset both before the ecobus probe.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Huang Ying <ying.huang@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed