]> git.openfabrics.org - ~emulex/infiniband.git/commit
drm/i915: Remove duplicate intel_uncore_forcewake_reset.
authorDeepak S <deepak.s@intel.com>
Sun, 8 Dec 2013 08:22:59 +0000 (13:52 +0530)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 9 Dec 2013 08:25:14 +0000 (09:25 +0100)
commitc461562e84d180fb691af57f93a42bd9cc7eb69c
treeaf1dca26744d49689e05d1f781d303f871f7d93f
parentf7698ba75fa283435f5077b9dfb4319d28b9de9a
drm/i915: Remove duplicate intel_uncore_forcewake_reset.

Since early sanitize and uncore sanitize are called one after the other,
I think, we can remove second forcewake reset which was are calling
twice in both the functions.

Note that this is merge fallout between

commit ef46e0d247da0a7a408573aa15870e231bbd4af2
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Sat Nov 16 16:00:09 2013 +0100

    drm/i915: restore the early forcewake cleanup

and

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

Signed-off-by: Deepak S <deepak.s@intel.com>
[danvet: Explain how this came to be.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_uncore.c