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

Commit 5c2db188 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: use calculated state for vblank evasion 



crtc->active will be gone eventually, and this check should be just as good.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3538b9df

drivers/gpu/drm/i915/intel_display.c

+2 −1
Original line number Diff line number Diff line
@@ -13658,6 +13658,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc) 
	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_crtc_state *crtc_state = intel_crtc->base.state;

	struct intel_plane *intel_plane;

	struct drm_plane *p;

	unsigned fb_bits = 0;
@@ -13701,7 +13702,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc) 
	intel_runtime_pm_get(dev_priv);



	/* Perform vblank evasion around commit operation */

	if (intel_crtc->active)

	if (crtc_state->active && !needs_modeset(crtc_state))

		intel_crtc->atomic.evade =

			intel_pipe_update_start(intel_crtc,

						&intel_crtc->atomic.start_vbl_count);