drm/i915: clean up vlv ->pre_pll_enable and pll enable sequence
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 11 Jul 2013 20:13:42 +0000 (22:13 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 12 Jul 2013 16:54:01 +0000 (18:54 +0200)
commit426115cf5dd81d17a6322c493ca337e637ce2aed
tree0f4a79cdd72db333fe3f44b6561e70b2222597be
parent84734a049d0ef2f6f5fb0a1fe060cd51480dd855
drm/i915: clean up vlv ->pre_pll_enable and pll enable sequence

No need to call the ->pre_pll_enable hook twice if we don't enable the
dpll too early. This should make Jani a bit less grumpy.

v2: Rebase on top of the newly-colored BUG_ONs.

v3: Reinstate the lost write of the DPLL_MD register, spotted by Imre.

Cc: Imre Deak <imre.deak@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c