From: Maarten Lankhorst Date: Wed, 23 Sep 2015 14:29:37 +0000 (+0200) Subject: drm/i915: Only commit active planes when updating planes during reset. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f029ee825cdfc486b24ee67a3d4d0b2c05c9bee5;p=openwrt%2Fstaging%2Fblogic.git 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 Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ef8282678a29..016fab6d1283 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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);