]> 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)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 17 Mar 2015 21:30:00 +0000 (22:30 +0100)
commit39fcbebce4211b8bfe4a79d20c3c35b48e06eff1
tree4bc50bdc97b14cd984f0f10ae9bf34ceeb439caa
parent6bf9926a02c3a96b11c64b59451591eb03bffe82
drm/i915: Do both mt and gen6 style forcewake reset on ivb probe

commit e845200e4347 ("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>
drivers/gpu/drm/i915/intel_uncore.c