| Message ID | 1420836965-10068-5-git-send-email-vandana.kannan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
looks ok for me... you will also have conflict so a rebased version is at: http://cgit.freedesktop.org/~vivijim/drm-intel/log/?h=review-drrs Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Fri, Jan 9, 2015 at 12:55 PM, Vandana Kannan <vandana.kannan@intel.com> wrote: > Calls have been added to invalidate/flush DRRS whenever invalidate/flush is > called as part of frontbuffer tracking. > Apart from calls as a result of GEM tracking to fb invalidate/flush, a > call has been added to invalidate fb obj from crtc_page_flip as well. This > is to track busyness through flip calls. > The call to fb_obj_invalidate (in flip) is placed before queuing flip for this > obj. > > drrs_invalidate() and drrs_flush() check for drrs.dp which would be NULL if > it was setup in drrs_enable(). This covers for the condition when DRRS is > not supported. > > v2: Removing the call to invalidate_drrs from page_flip. > This has not been tested on Android yet, but, in case DRRS transtions do not > work as expected, check by adding back this call in page_flip. > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 51 ++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_drv.h | 3 ++ > drivers/gpu/drm/i915/intel_frontbuffer.c | 2 ++ > 3 files changed, 56 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 5e7dc7b..ca89e59 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4902,6 +4902,57 @@ unlock: > mutex_unlock(&dev_priv->drrs.mutex); > } > > +void intel_edp_drrs_invalidate(struct drm_device *dev, > + unsigned frontbuffer_bits) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_crtc *crtc; > + enum pipe pipe; > + > + if (!dev_priv->drrs.dp) > + return; > + > + mutex_lock(&dev_priv->drrs.mutex); > + crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc; > + pipe = to_intel_crtc(crtc)->pipe; > + > + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) { > + cancel_delayed_work_sync(&dev_priv->drrs.work); > + intel_dp_set_drrs_state(dev_priv->dev, > + dev_priv->drrs.dp->attached_connector->panel. > + fixed_mode->vrefresh); > + } > + > + frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe); > + > + dev_priv->drrs.busy_frontbuffer_bits |= frontbuffer_bits; > + mutex_unlock(&dev_priv->drrs.mutex); > +} > + > +void intel_edp_drrs_flush(struct drm_device *dev, > + unsigned frontbuffer_bits) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_crtc *crtc; > + enum pipe pipe; > + > + if (!dev_priv->drrs.dp) > + return; > + > + mutex_lock(&dev_priv->drrs.mutex); > + crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc; > + pipe = to_intel_crtc(crtc)->pipe; > + dev_priv->drrs.busy_frontbuffer_bits &= ~frontbuffer_bits; > + > + cancel_delayed_work_sync(&dev_priv->drrs.work); > + > + if (dev_priv->drrs.refresh_rate_type != DRRS_LOW_RR && > + !dev_priv->drrs.busy_frontbuffer_bits) > + schedule_delayed_work(&dev_priv->drrs.work, > + msecs_to_jiffies(1000)); > + mutex_unlock(&dev_priv->drrs.mutex); > +} > + > static struct drm_display_mode * > intel_dp_drrs_init(struct intel_connector *intel_connector, > struct drm_display_mode *fixed_mode) > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 6f3ad3b..17f168a 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1005,6 +1005,9 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, > int intel_disable_plane(struct drm_plane *plane); > void intel_edp_drrs_enable(struct intel_dp *intel_dp); > void intel_edp_drrs_disable(struct intel_dp *intel_dp); > +void intel_edp_drrs_invalidate(struct drm_device *dev, > + unsigned frontbuffer_bits); > +void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffer_bits); > > /* intel_dp_mst.c */ > int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id); > diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c > index 79f6d72..73cb6e0 100644 > --- a/drivers/gpu/drm/i915/intel_frontbuffer.c > +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c > @@ -157,6 +157,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, > intel_mark_fb_busy(dev, obj->frontbuffer_bits, ring); > > intel_psr_invalidate(dev, obj->frontbuffer_bits); > + intel_edp_drrs_invalidate(dev, obj->frontbuffer_bits); > } > > /** > @@ -182,6 +183,7 @@ void intel_frontbuffer_flush(struct drm_device *dev, > > intel_mark_fb_busy(dev, frontbuffer_bits, NULL); > > + intel_edp_drrs_flush(dev, frontbuffer_bits); > intel_psr_flush(dev, frontbuffer_bits); > > /* > -- > 2.0.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Jan 15, 2015 at 02:49:55PM -0800, Rodrigo Vivi wrote: > looks ok for me... > you will also have conflict so a rebased version is at: > http://cgit.freedesktop.org/~vivijim/drm-intel/log/?h=review-drrs > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Merged up to this one, thanks for patches&review. -Daniel > > On Fri, Jan 9, 2015 at 12:55 PM, Vandana Kannan > <vandana.kannan@intel.com> wrote: > > Calls have been added to invalidate/flush DRRS whenever invalidate/flush is > > called as part of frontbuffer tracking. > > Apart from calls as a result of GEM tracking to fb invalidate/flush, a > > call has been added to invalidate fb obj from crtc_page_flip as well. This > > is to track busyness through flip calls. > > The call to fb_obj_invalidate (in flip) is placed before queuing flip for this > > obj. > > > > drrs_invalidate() and drrs_flush() check for drrs.dp which would be NULL if > > it was setup in drrs_enable(). This covers for the condition when DRRS is > > not supported. > > > > v2: Removing the call to invalidate_drrs from page_flip. > > This has not been tested on Android yet, but, in case DRRS transtions do not > > work as expected, check by adding back this call in page_flip. > > > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > > --- > > drivers/gpu/drm/i915/intel_dp.c | 51 ++++++++++++++++++++++++++++++++ > > drivers/gpu/drm/i915/intel_drv.h | 3 ++ > > drivers/gpu/drm/i915/intel_frontbuffer.c | 2 ++ > > 3 files changed, 56 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > > index 5e7dc7b..ca89e59 100644 > > --- a/drivers/gpu/drm/i915/intel_dp.c > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -4902,6 +4902,57 @@ unlock: > > mutex_unlock(&dev_priv->drrs.mutex); > > } > > > > +void intel_edp_drrs_invalidate(struct drm_device *dev, > > + unsigned frontbuffer_bits) > > +{ > > + struct drm_i915_private *dev_priv = dev->dev_private; > > + struct drm_crtc *crtc; > > + enum pipe pipe; > > + > > + if (!dev_priv->drrs.dp) > > + return; > > + > > + mutex_lock(&dev_priv->drrs.mutex); > > + crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc; > > + pipe = to_intel_crtc(crtc)->pipe; > > + > > + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) { > > + cancel_delayed_work_sync(&dev_priv->drrs.work); > > + intel_dp_set_drrs_state(dev_priv->dev, > > + dev_priv->drrs.dp->attached_connector->panel. > > + fixed_mode->vrefresh); > > + } > > + > > + frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe); > > + > > + dev_priv->drrs.busy_frontbuffer_bits |= frontbuffer_bits; > > + mutex_unlock(&dev_priv->drrs.mutex); > > +} > > + > > +void intel_edp_drrs_flush(struct drm_device *dev, > > + unsigned frontbuffer_bits) > > +{ > > + struct drm_i915_private *dev_priv = dev->dev_private; > > + struct drm_crtc *crtc; > > + enum pipe pipe; > > + > > + if (!dev_priv->drrs.dp) > > + return; > > + > > + mutex_lock(&dev_priv->drrs.mutex); > > + crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc; > > + pipe = to_intel_crtc(crtc)->pipe; > > + dev_priv->drrs.busy_frontbuffer_bits &= ~frontbuffer_bits; > > + > > + cancel_delayed_work_sync(&dev_priv->drrs.work); > > + > > + if (dev_priv->drrs.refresh_rate_type != DRRS_LOW_RR && > > + !dev_priv->drrs.busy_frontbuffer_bits) > > + schedule_delayed_work(&dev_priv->drrs.work, > > + msecs_to_jiffies(1000)); > > + mutex_unlock(&dev_priv->drrs.mutex); > > +} > > + > > static struct drm_display_mode * > > intel_dp_drrs_init(struct intel_connector *intel_connector, > > struct drm_display_mode *fixed_mode) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index 6f3ad3b..17f168a 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -1005,6 +1005,9 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, > > int intel_disable_plane(struct drm_plane *plane); > > void intel_edp_drrs_enable(struct intel_dp *intel_dp); > > void intel_edp_drrs_disable(struct intel_dp *intel_dp); > > +void intel_edp_drrs_invalidate(struct drm_device *dev, > > + unsigned frontbuffer_bits); > > +void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffer_bits); > > > > /* intel_dp_mst.c */ > > int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id); > > diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c > > index 79f6d72..73cb6e0 100644 > > --- a/drivers/gpu/drm/i915/intel_frontbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c > > @@ -157,6 +157,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, > > intel_mark_fb_busy(dev, obj->frontbuffer_bits, ring); > > > > intel_psr_invalidate(dev, obj->frontbuffer_bits); > > + intel_edp_drrs_invalidate(dev, obj->frontbuffer_bits); > > } > > > > /** > > @@ -182,6 +183,7 @@ void intel_frontbuffer_flush(struct drm_device *dev, > > > > intel_mark_fb_busy(dev, frontbuffer_bits, NULL); > > > > + intel_edp_drrs_flush(dev, frontbuffer_bits); > > intel_psr_flush(dev, frontbuffer_bits); > > > > /* > > -- > > 2.0.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Rodrigo Vivi > Blog: http://blog.vivi.eng.br > _______________________________________________ > 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_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 5e7dc7b..ca89e59 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4902,6 +4902,57 @@ unlock: mutex_unlock(&dev_priv->drrs.mutex); } +void intel_edp_drrs_invalidate(struct drm_device *dev, + unsigned frontbuffer_bits) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_crtc *crtc; + enum pipe pipe; + + if (!dev_priv->drrs.dp) + return; + + mutex_lock(&dev_priv->drrs.mutex); + crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc; + pipe = to_intel_crtc(crtc)->pipe; + + if (dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR) { + cancel_delayed_work_sync(&dev_priv->drrs.work); + intel_dp_set_drrs_state(dev_priv->dev, + dev_priv->drrs.dp->attached_connector->panel. + fixed_mode->vrefresh); + } + + frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe); + + dev_priv->drrs.busy_frontbuffer_bits |= frontbuffer_bits; + mutex_unlock(&dev_priv->drrs.mutex); +} + +void intel_edp_drrs_flush(struct drm_device *dev, + unsigned frontbuffer_bits) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_crtc *crtc; + enum pipe pipe; + + if (!dev_priv->drrs.dp) + return; + + mutex_lock(&dev_priv->drrs.mutex); + crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc; + pipe = to_intel_crtc(crtc)->pipe; + dev_priv->drrs.busy_frontbuffer_bits &= ~frontbuffer_bits; + + cancel_delayed_work_sync(&dev_priv->drrs.work); + + if (dev_priv->drrs.refresh_rate_type != DRRS_LOW_RR && + !dev_priv->drrs.busy_frontbuffer_bits) + schedule_delayed_work(&dev_priv->drrs.work, + msecs_to_jiffies(1000)); + mutex_unlock(&dev_priv->drrs.mutex); +} + static struct drm_display_mode * intel_dp_drrs_init(struct intel_connector *intel_connector, struct drm_display_mode *fixed_mode) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 6f3ad3b..17f168a 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1005,6 +1005,9 @@ int intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, int intel_disable_plane(struct drm_plane *plane); void intel_edp_drrs_enable(struct intel_dp *intel_dp); void intel_edp_drrs_disable(struct intel_dp *intel_dp); +void intel_edp_drrs_invalidate(struct drm_device *dev, + unsigned frontbuffer_bits); +void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffer_bits); /* intel_dp_mst.c */ int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id); diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c index 79f6d72..73cb6e0 100644 --- a/drivers/gpu/drm/i915/intel_frontbuffer.c +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c @@ -157,6 +157,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, intel_mark_fb_busy(dev, obj->frontbuffer_bits, ring); intel_psr_invalidate(dev, obj->frontbuffer_bits); + intel_edp_drrs_invalidate(dev, obj->frontbuffer_bits); } /** @@ -182,6 +183,7 @@ void intel_frontbuffer_flush(struct drm_device *dev, intel_mark_fb_busy(dev, frontbuffer_bits, NULL); + intel_edp_drrs_flush(dev, frontbuffer_bits); intel_psr_flush(dev, frontbuffer_bits); /*
Calls have been added to invalidate/flush DRRS whenever invalidate/flush is called as part of frontbuffer tracking. Apart from calls as a result of GEM tracking to fb invalidate/flush, a call has been added to invalidate fb obj from crtc_page_flip as well. This is to track busyness through flip calls. The call to fb_obj_invalidate (in flip) is placed before queuing flip for this obj. drrs_invalidate() and drrs_flush() check for drrs.dp which would be NULL if it was setup in drrs_enable(). This covers for the condition when DRRS is not supported. v2: Removing the call to invalidate_drrs from page_flip. This has not been tested on Android yet, but, in case DRRS transtions do not work as expected, check by adding back this call in page_flip. Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 51 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 3 ++ drivers/gpu/drm/i915/intel_frontbuffer.c | 2 ++ 3 files changed, 56 insertions(+)