drm/i915/gen9+: Use cstate plane mask instead of crtc->state.

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 <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/1477489299-25777-3-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Matt Roper <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 87959d9401a9a4919671ef47358d2bb7192b398e..e6e9cc5634841530e4ba3c7d568383c45c175c40 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -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],