]> git.baikalelectronics.ru Git - kernel.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)
commitb7da86e64b915bb6324334c102e44b756236d6b1
treeaf1dca26744d49689e05d1f781d303f871f7d93f
parent5581faf55237f9cf1570fe23d451df16d1009716
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 7a7a4838c3af93c702eab2202366a4bfce8240d4
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 f9f161e3f8b8803cddfcb85002ce576e77dbc512
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