Commit f029ee82 authored Sep 23, 2015 by Maarten Lankhorst Committed by Daniel Vetter Oct 19, 2015

drm/i915: Only commit active planes when updating planes during reset.



In the next commit commit_plane will no longer check if the crtc is active.
To prevent issues with legacy page flips the check should be performed inside
update_primary_planes.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 61067a5e

drivers/gpu/drm/i915/intel_display.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3194,10 +3194,9 @@ static void intel_update_primary_planes(struct drm_device *dev)
		struct intel_plane_state *plane_state;

		drm_modeset_lock_crtc(crtc, &plane->base);

		plane_state = to_intel_plane_state(plane->base.state);

		if (plane_state->base.fb)
		if (crtc->state->active && plane_state->base.fb)
		plane->commit_plane(&plane->base, plane_state);

		drm_modeset_unlock_crtc(crtc);