diff options
author | Hans de Goede <hdegoede@redhat.com> | 2016-12-01 21:29:13 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-12-23 15:34:17 +0200 |
commit | e840fd31085220cdeabbeaab13d515e5b6aef004 (patch) | |
tree | 1929069be6ba5c61b1ace0ce391af52ab82c4862 /drivers/gpu/drm/i915/intel_dsi.c | |
parent | ce2e87b4ce9a6c14b3f60756b58a6b5c77e083bd (diff) | |
download | op-kernel-dev-e840fd31085220cdeabbeaab13d515e5b6aef004.zip op-kernel-dev-e840fd31085220cdeabbeaab13d515e5b6aef004.tar.gz |
drm/i915/dsi: Move disable pll call outside of clear_device_ready()
On enable intel_dsi_enable() directly calls intel_enable_dsi_pll(),
make intel_dsi_disable() also directly call intel_disable_dsi_pll(),
rather then hiding the call in intel_dsi_clear_device_ready(),
no functional changes.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161201202925.12220-7-hdegoede@redhat.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dsi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index c978852..2070ada 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -699,8 +699,6 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) I915_WRITE(MIPI_DEVICE_READY(port), 0x00); usleep_range(2000, 2500); } - - intel_disable_dsi_pll(encoder); } static void intel_dsi_post_disable(struct intel_encoder *encoder, @@ -716,6 +714,8 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder, intel_dsi_clear_device_ready(encoder); + intel_disable_dsi_pll(encoder); + if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { u32 val; |