| Message ID | 1463490484-19540-16-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 17, 2016 at 03:07:58PM +0200, Maarten Lankhorst wrote: > With the removal of cs-based flips all mmio waits will > finish without requiring the reset counter, because the > waits will complete during gpu reset. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 9 --------- > drivers/gpu/drm/i915/intel_drv.h | 3 --- > 2 files changed, 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index d96f6a86d6f6..db8c6d905007 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3179,14 +3179,6 @@ void intel_finish_reset(struct drm_i915_private *dev_priv) > > static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc) > { > - struct drm_device *dev = crtc->dev; > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - unsigned reset_counter; > - > - reset_counter = i915_reset_counter(&to_i915(dev)->gpu_error); > - if (intel_crtc->reset_counter != reset_counter) > - return false; > - > return !list_empty_careful(&to_intel_crtc(crtc)->flip_work); > } > > @@ -11179,7 +11171,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > > intel_fbc_pre_update(intel_crtc); > > - intel_crtc->reset_counter = i915_reset_counter(&dev_priv->gpu_error); > schedule_work(&work->mmio_work); > > mutex_unlock(&dev->struct_mutex); > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index c538d821a728..11dae90b7168 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -659,9 +659,6 @@ struct intel_crtc { > > struct intel_crtc_state *config; > > - /* reset counter value when the last flip was submitted */ > - unsigned int reset_counter; > - > /* Access to these should be protected by dev_priv->irq_lock. */ > bool cpu_fifo_underrun_disabled; > bool pch_fifo_underrun_disabled; > -- > 2.5.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d96f6a86d6f6..db8c6d905007 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3179,14 +3179,6 @@ void intel_finish_reset(struct drm_i915_private *dev_priv) static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - unsigned reset_counter; - - reset_counter = i915_reset_counter(&to_i915(dev)->gpu_error); - if (intel_crtc->reset_counter != reset_counter) - return false; - return !list_empty_careful(&to_intel_crtc(crtc)->flip_work); } @@ -11179,7 +11171,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, intel_fbc_pre_update(intel_crtc); - intel_crtc->reset_counter = i915_reset_counter(&dev_priv->gpu_error); schedule_work(&work->mmio_work); mutex_unlock(&dev->struct_mutex); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index c538d821a728..11dae90b7168 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -659,9 +659,6 @@ struct intel_crtc { struct intel_crtc_state *config; - /* reset counter value when the last flip was submitted */ - unsigned int reset_counter; - /* Access to these should be protected by dev_priv->irq_lock. */ bool cpu_fifo_underrun_disabled; bool pch_fifo_underrun_disabled;
With the removal of cs-based flips all mmio waits will finish without requiring the reset counter, because the waits will complete during gpu reset. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 9 --------- drivers/gpu/drm/i915/intel_drv.h | 3 --- 2 files changed, 12 deletions(-)