drm/i915: Move DPLL ref/cri/VGA mode frobbing to the disp2d well enable
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 29 Jun 2015 12:25:53 +0000 (15:25 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 26 Aug 2015 12:33:52 +0000 (14:33 +0200)
commit5a8fbb7d192b96de3d258164e5fc95b769d698c3
treebf58169c0007fec79844f571d4199ae6eddedcc6
parent4d9194dec37a9bf22354f6a5872e285e1bb8c1da
drm/i915: Move DPLL ref/cri/VGA mode frobbing to the disp2d well enable

Bunch of stuff needs the DPLL ref/cri clocks on both VLV and CHV,
and having VGA mode enabled causes some problems for CHV. So let's just
pull the code to configure those bits into the disp2d well enable hook.
With the DPLL disable code also fixed to leave those bits alone we
should now have a consistent DPLL state all the time even if the DPLL
is disabled.

This also neatly removes some duplicated code between the VLV and
CHV codepaths.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_runtime_pm.c