]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Do both mt and gen6 style forcewake reset on ivb probe
authorMika Kuoppala <mika.kuoppala@linux.intel.com>
Fri, 27 Feb 2015 16:11:09 +0000 (18:11 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 10 Mar 2015 09:56:57 +0000 (11:56 +0200)
commitda4b5e3a90f3a942e1660666c6a147a4ca28f554
tree852ad2a4bc3f9011401c3cc933e375754b04d6b7
parent3b4578c7e058239a9cce54f3566b5e9323a287ad
drm/i915: Do both mt and gen6 style forcewake reset on ivb probe

commit 9c7d65d31d33 ("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: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_uncore.c