Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7171af authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Remove reset_counter from intel_crtc. 



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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463490484-19540-16-git-send-email-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarPatrik Jakobsson <patrik.jakobsson@linux.intel.com>
parent 2ee004f7

drivers/gpu/drm/i915/intel_display.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/intel_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -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;