| Message ID | 1421920060-32481-1-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
re Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Thu, Jan 22, 2015 at 1:47 AM, Ramalingam C <ramalingam.c@intel.com> wrote: > From: Vandana Kannan <vandana.kannan@intel.com> > > Calling enable/disable DRRS when enable/disable DDI are called. > These functions are responsible for setup of drrs data (in enable) and > reset of drrs (in disable). > has_drrs is true when downclock_mode is found and SEAMLESS_DRRS is set in > the VBT. A check has been added for has_drrs in these functions, to make > sure the functions go through only if DRRS will work on the platform with > the attached panel. > > V2: [By Ram]: WARN_ON is used when intel_edp_drrs_enable() is called more than > once [Rodrigo] > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > --- > drivers/gpu/drm/i915/intel_ddi.c | 2 ++ > drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > 3 files changed, 59 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index f10ec26..ad8b73d 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -1610,6 +1610,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder) > > intel_edp_backlight_on(intel_dp); > intel_psr_enable(intel_dp); > + intel_edp_drrs_enable(intel_dp); > } > > if (intel_crtc->config->has_audio) { > @@ -1635,6 +1636,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) > if (type == INTEL_OUTPUT_EDP) { > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > + intel_edp_drrs_disable(intel_dp); > intel_psr_disable(intel_dp); > intel_edp_backlight_off(intel_dp); > } > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index c066560..f843fe0 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4820,6 +4820,61 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) > DRM_DEBUG_KMS("eDP Refresh Rate set to : %dHz\n", refresh_rate); > } > > +void intel_edp_drrs_enable(struct intel_dp *intel_dp) > +{ > + struct drm_device *dev = intel_dp_to_dev(intel_dp); > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > + struct drm_crtc *crtc = dig_port->base.base.crtc; > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > + > + if (!intel_crtc->config->has_drrs) { > + DRM_DEBUG_KMS("Panel doesn't support DRRS\n"); > + return; > + } > + > + mutex_lock(&dev_priv->drrs.mutex); > + if (WARN_ON(dev_priv->drrs.dp)) { > + DRM_ERROR("DRRS already enabled\n"); > + goto unlock; > + } > + > + dev_priv->drrs.busy_frontbuffer_bits = 0; > + > + dev_priv->drrs.dp = intel_dp; > + > +unlock: > + mutex_unlock(&dev_priv->drrs.mutex); > +} > + > +void intel_edp_drrs_disable(struct intel_dp *intel_dp) > +{ > + struct drm_device *dev = intel_dp_to_dev(intel_dp); > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > + struct drm_crtc *crtc = dig_port->base.base.crtc; > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > + > + if (!intel_crtc->config->has_drrs) > + return; > + > + mutex_lock(&dev_priv->drrs.mutex); > + if (!dev_priv->drrs.dp) { > + mutex_unlock(&dev_priv->drrs.mutex); > + return; > + } > + > + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) > + intel_dp_set_drrs_state(dev_priv->dev, > + intel_dp->attached_connector->panel. > + fixed_mode->vrefresh); > + > + dev_priv->drrs.dp = NULL; > + mutex_unlock(&dev_priv->drrs.mutex); > + > + cancel_delayed_work_sync(&dev_priv->drrs.work); > +} > + > static void intel_edp_drrs_downclock_work(struct work_struct *work) > { > struct drm_i915_private *dev_priv = > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index e957d4d..5a14725 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1030,6 +1030,8 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, > uint32_t src_w, uint32_t src_h); > int intel_disable_plane(struct drm_plane *plane); > void intel_plane_destroy(struct drm_plane *plane); > +void intel_edp_drrs_enable(struct intel_dp *intel_dp); > +void intel_edp_drrs_disable(struct intel_dp *intel_dp); > > /* intel_dp_mst.c */ > int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Jan 22, 2015 at 03:17:40PM +0530, Ramalingam C wrote: > From: Vandana Kannan <vandana.kannan@intel.com> > > Calling enable/disable DRRS when enable/disable DDI are called. > These functions are responsible for setup of drrs data (in enable) and > reset of drrs (in disable). > has_drrs is true when downclock_mode is found and SEAMLESS_DRRS is set in > the VBT. A check has been added for has_drrs in these functions, to make > sure the functions go through only if DRRS will work on the platform with > the attached panel. > > V2: [By Ram]: WARN_ON is used when intel_edp_drrs_enable() is called more than > once [Rodrigo] > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Please be a bit more careful with adding sob lines - afaik Rodrigo did not handle this patch. If you just want to get people's attention, please use Cc: instead. Fixed while applying. -Daniel > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > --- > drivers/gpu/drm/i915/intel_ddi.c | 2 ++ > drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > 3 files changed, 59 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index f10ec26..ad8b73d 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -1610,6 +1610,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder) > > intel_edp_backlight_on(intel_dp); > intel_psr_enable(intel_dp); > + intel_edp_drrs_enable(intel_dp); > } > > if (intel_crtc->config->has_audio) { > @@ -1635,6 +1636,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) > if (type == INTEL_OUTPUT_EDP) { > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > + intel_edp_drrs_disable(intel_dp); > intel_psr_disable(intel_dp); > intel_edp_backlight_off(intel_dp); > } > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index c066560..f843fe0 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4820,6 +4820,61 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) > DRM_DEBUG_KMS("eDP Refresh Rate set to : %dHz\n", refresh_rate); > } > > +void intel_edp_drrs_enable(struct intel_dp *intel_dp) > +{ > + struct drm_device *dev = intel_dp_to_dev(intel_dp); > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > + struct drm_crtc *crtc = dig_port->base.base.crtc; > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > + > + if (!intel_crtc->config->has_drrs) { > + DRM_DEBUG_KMS("Panel doesn't support DRRS\n"); > + return; > + } > + > + mutex_lock(&dev_priv->drrs.mutex); > + if (WARN_ON(dev_priv->drrs.dp)) { > + DRM_ERROR("DRRS already enabled\n"); > + goto unlock; > + } > + > + dev_priv->drrs.busy_frontbuffer_bits = 0; > + > + dev_priv->drrs.dp = intel_dp; > + > +unlock: > + mutex_unlock(&dev_priv->drrs.mutex); > +} > + > +void intel_edp_drrs_disable(struct intel_dp *intel_dp) > +{ > + struct drm_device *dev = intel_dp_to_dev(intel_dp); > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > + struct drm_crtc *crtc = dig_port->base.base.crtc; > + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > + > + if (!intel_crtc->config->has_drrs) > + return; > + > + mutex_lock(&dev_priv->drrs.mutex); > + if (!dev_priv->drrs.dp) { > + mutex_unlock(&dev_priv->drrs.mutex); > + return; > + } > + > + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) > + intel_dp_set_drrs_state(dev_priv->dev, > + intel_dp->attached_connector->panel. > + fixed_mode->vrefresh); > + > + dev_priv->drrs.dp = NULL; > + mutex_unlock(&dev_priv->drrs.mutex); > + > + cancel_delayed_work_sync(&dev_priv->drrs.work); > +} > + > static void intel_edp_drrs_downclock_work(struct work_struct *work) > { > struct drm_i915_private *dev_priv = > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index e957d4d..5a14725 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1030,6 +1030,8 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, > uint32_t src_w, uint32_t src_h); > int intel_disable_plane(struct drm_plane *plane); > void intel_plane_destroy(struct drm_plane *plane); > +void intel_edp_drrs_enable(struct intel_dp *intel_dp); > +void intel_edp_drrs_disable(struct intel_dp *intel_dp); > > /* intel_dp_mst.c */ > int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Sun, Jan 25, 2015 at 11:31 PM, Daniel Vetter <daniel@ffwll.ch> wrote: > On Thu, Jan 22, 2015 at 03:17:40PM +0530, Ramalingam C wrote: >> From: Vandana Kannan <vandana.kannan@intel.com> >> >> Calling enable/disable DRRS when enable/disable DDI are called. >> These functions are responsible for setup of drrs data (in enable) and >> reset of drrs (in disable). >> has_drrs is true when downclock_mode is found and SEAMLESS_DRRS is set in >> the VBT. A check has been added for has_drrs in these functions, to make >> sure the functions go through only if DRRS will work on the platform with >> the attached panel. >> >> V2: [By Ram]: WARN_ON is used when intel_edp_drrs_enable() is called more than >> once [Rodrigo] >> >> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> >> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Please be a bit more careful with adding sob lines - afaik Rodrigo did not > handle this patch. If you just want to get people's attention, please use > Cc: instead. > > Fixed while applying. > -Daniel that was actually my fault... I had fixed a rebase conflicted and added to a drrs-review branch at cgit. I signed-off but didn't increment the v2 explaining the rebase. Thanks for merging. > >> Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >> --- >> drivers/gpu/drm/i915/intel_ddi.c | 2 ++ >> drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++++++++ >> drivers/gpu/drm/i915/intel_drv.h | 2 ++ >> 3 files changed, 59 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c >> index f10ec26..ad8b73d 100644 >> --- a/drivers/gpu/drm/i915/intel_ddi.c >> +++ b/drivers/gpu/drm/i915/intel_ddi.c >> @@ -1610,6 +1610,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder) >> >> intel_edp_backlight_on(intel_dp); >> intel_psr_enable(intel_dp); >> + intel_edp_drrs_enable(intel_dp); >> } >> >> if (intel_crtc->config->has_audio) { >> @@ -1635,6 +1636,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) >> if (type == INTEL_OUTPUT_EDP) { >> struct intel_dp *intel_dp = enc_to_intel_dp(encoder); >> >> + intel_edp_drrs_disable(intel_dp); >> intel_psr_disable(intel_dp); >> intel_edp_backlight_off(intel_dp); >> } >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index c066560..f843fe0 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -4820,6 +4820,61 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) >> DRM_DEBUG_KMS("eDP Refresh Rate set to : %dHz\n", refresh_rate); >> } >> >> +void intel_edp_drrs_enable(struct intel_dp *intel_dp) >> +{ >> + struct drm_device *dev = intel_dp_to_dev(intel_dp); >> + struct drm_i915_private *dev_priv = dev->dev_private; >> + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); >> + struct drm_crtc *crtc = dig_port->base.base.crtc; >> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); >> + >> + if (!intel_crtc->config->has_drrs) { >> + DRM_DEBUG_KMS("Panel doesn't support DRRS\n"); >> + return; >> + } >> + >> + mutex_lock(&dev_priv->drrs.mutex); >> + if (WARN_ON(dev_priv->drrs.dp)) { >> + DRM_ERROR("DRRS already enabled\n"); >> + goto unlock; >> + } >> + >> + dev_priv->drrs.busy_frontbuffer_bits = 0; >> + >> + dev_priv->drrs.dp = intel_dp; >> + >> +unlock: >> + mutex_unlock(&dev_priv->drrs.mutex); >> +} >> + >> +void intel_edp_drrs_disable(struct intel_dp *intel_dp) >> +{ >> + struct drm_device *dev = intel_dp_to_dev(intel_dp); >> + struct drm_i915_private *dev_priv = dev->dev_private; >> + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); >> + struct drm_crtc *crtc = dig_port->base.base.crtc; >> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); >> + >> + if (!intel_crtc->config->has_drrs) >> + return; >> + >> + mutex_lock(&dev_priv->drrs.mutex); >> + if (!dev_priv->drrs.dp) { >> + mutex_unlock(&dev_priv->drrs.mutex); >> + return; >> + } >> + >> + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) >> + intel_dp_set_drrs_state(dev_priv->dev, >> + intel_dp->attached_connector->panel. >> + fixed_mode->vrefresh); >> + >> + dev_priv->drrs.dp = NULL; >> + mutex_unlock(&dev_priv->drrs.mutex); >> + >> + cancel_delayed_work_sync(&dev_priv->drrs.work); >> +} >> + >> static void intel_edp_drrs_downclock_work(struct work_struct *work) >> { >> struct drm_i915_private *dev_priv = >> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >> index e957d4d..5a14725 100644 >> --- a/drivers/gpu/drm/i915/intel_drv.h >> +++ b/drivers/gpu/drm/i915/intel_drv.h >> @@ -1030,6 +1030,8 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, >> uint32_t src_w, uint32_t src_h); >> int intel_disable_plane(struct drm_plane *plane); >> void intel_plane_destroy(struct drm_plane *plane); >> +void intel_edp_drrs_enable(struct intel_dp *intel_dp); >> +void intel_edp_drrs_disable(struct intel_dp *intel_dp); >> >> /* intel_dp_mst.c */ >> int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id); >> -- >> 1.7.9.5 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index f10ec26..ad8b73d 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1610,6 +1610,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder) intel_edp_backlight_on(intel_dp); intel_psr_enable(intel_dp); + intel_edp_drrs_enable(intel_dp); } if (intel_crtc->config->has_audio) { @@ -1635,6 +1636,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) if (type == INTEL_OUTPUT_EDP) { struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + intel_edp_drrs_disable(intel_dp); intel_psr_disable(intel_dp); intel_edp_backlight_off(intel_dp); } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index c066560..f843fe0 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4820,6 +4820,61 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) DRM_DEBUG_KMS("eDP Refresh Rate set to : %dHz\n", refresh_rate); } +void intel_edp_drrs_enable(struct intel_dp *intel_dp) +{ + struct drm_device *dev = intel_dp_to_dev(intel_dp); + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); + struct drm_crtc *crtc = dig_port->base.base.crtc; + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + + if (!intel_crtc->config->has_drrs) { + DRM_DEBUG_KMS("Panel doesn't support DRRS\n"); + return; + } + + mutex_lock(&dev_priv->drrs.mutex); + if (WARN_ON(dev_priv->drrs.dp)) { + DRM_ERROR("DRRS already enabled\n"); + goto unlock; + } + + dev_priv->drrs.busy_frontbuffer_bits = 0; + + dev_priv->drrs.dp = intel_dp; + +unlock: + mutex_unlock(&dev_priv->drrs.mutex); +} + +void intel_edp_drrs_disable(struct intel_dp *intel_dp) +{ + struct drm_device *dev = intel_dp_to_dev(intel_dp); + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); + struct drm_crtc *crtc = dig_port->base.base.crtc; + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + + if (!intel_crtc->config->has_drrs) + return; + + mutex_lock(&dev_priv->drrs.mutex); + if (!dev_priv->drrs.dp) { + mutex_unlock(&dev_priv->drrs.mutex); + return; + } + + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) + intel_dp_set_drrs_state(dev_priv->dev, + intel_dp->attached_connector->panel. + fixed_mode->vrefresh); + + dev_priv->drrs.dp = NULL; + mutex_unlock(&dev_priv->drrs.mutex); + + cancel_delayed_work_sync(&dev_priv->drrs.work); +} + static void intel_edp_drrs_downclock_work(struct work_struct *work) { struct drm_i915_private *dev_priv = diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index e957d4d..5a14725 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1030,6 +1030,8 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, uint32_t src_w, uint32_t src_h); int intel_disable_plane(struct drm_plane *plane); void intel_plane_destroy(struct drm_plane *plane); +void intel_edp_drrs_enable(struct intel_dp *intel_dp); +void intel_edp_drrs_disable(struct intel_dp *intel_dp); /* intel_dp_mst.c */ int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);