| Message ID | 20161201202925.12220-7-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 01 Dec 2016, Hans de Goede <hdegoede@redhat.com> wrote: > 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> Pushed this one to drm-intel-next-queued, thanks for the patch. BR, Jani. > --- > drivers/gpu/drm/i915/intel_dsi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 967bae9..cb15c0a 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -642,8 +642,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, > @@ -674,6 +672,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;
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 967bae9..cb15c0a 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -642,8 +642,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, @@ -674,6 +672,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;
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> --- drivers/gpu/drm/i915/intel_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)