drm/i915/gen9+: Use cstate plane mask instead of crtc->state.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 26 Oct 2016 13:41:30 +0000 (15:41 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 1 Nov 2016 13:43:58 +0000 (14:43 +0100)
I'm planning on getting rid of all obj->state dereferences,
and replace thhem with accessor functions.
Remove this one early, they're equivalent because removed
planes are already part of the state, else they could not
have been removed.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477489299-25777-3-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
drivers/gpu/drm/i915/intel_pm.c

index 87959d9..e6e9cc5 100644 (file)
@@ -3975,7 +3975,7 @@ skl_ddb_add_affected_planes(struct intel_crtc_state *cstate)
 
        WARN_ON(!drm_atomic_get_existing_crtc_state(state, crtc));
 
-       drm_for_each_plane_mask(plane, dev, crtc->state->plane_mask) {
+       drm_for_each_plane_mask(plane, dev, cstate->base.plane_mask) {
                id = skl_wm_plane_id(to_intel_plane(plane));
 
                if (skl_ddb_entry_equal(&cur_ddb->plane[pipe][id],