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 <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index b8cd2aec3bf8..e7b094c22e47 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3154,10 +3154,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);
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to