drm/i915: Use crtc_state->active in primary check_plane func
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 7 Jul 2015 09:15:47 +0000 (11:15 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 8 Jul 2015 14:42:25 +0000 (16:42 +0200)
Since

commit 8c7b5ccb729870e606321b3703e2c2e698c49a95
Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Date:   Tue Apr 21 17:13:19 2015 +0300

    drm/i915: Use atomic helpers for computing changed flags

we compute the plane state for a modeset before actually committing
any changes, which means crtc->active won't be correct yet. Looking at
future work in the modeset conversion targetting 4.3 the only places
where crtc_state->active isn't accurate is when disabling other CRTCs
than the one the modeset is for (when stealing connectors). Which
isn't the case here. And that's also confirmed by an audit, we do
unconditionally update crtc_state->active for the current pipe.

We also don't need to update any other plane check functions since we
only ever add the primary state to the modeset update right now.

Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 647b1404c441374beba20b32be37192d0b0ace95..ba9321998a41b3fb646cc7883b8c4c6cb9e9c08f 100644 (file)
@@ -13276,7 +13276,7 @@ intel_check_primary_plane(struct drm_plane *plane,
        if (ret)
                return ret;
 
-       if (intel_crtc->active) {
+       if (crtc_state->base.active) {
                struct intel_plane_state *old_state =
                        to_intel_plane_state(plane->state);