drm_atomic_get_existing_state should be removed, so stop using it in i915. Fortunately all places can be converted to use the new state or old state, even removing some dereferncing of obj->state in the process. i915 no longer depends on plane->fb, so patch 6 removes the assignment. The first 6 patches should definitely be upstreamed, last 2 are RFC, but probably should be upstreamed. I added them because I'm curious if it fixes FD.org #101597. Maarten Lankhorst (8): drm/i915: Change use get_new_plane_state instead of existing plane state drm/i915: Change get_existing_crtc_state to old state drm/i915: Use new atomic helpers in intel_plane_atomic_check drm/i915: Use intel_atomic_get_new_crtc_state in intel_fbc.c drm/i915: Remove last references to drm_atomic_get_existing* macros drm/i915: Do not update legacy state any more drm/i915: Calculate ironlake intermediate watermarks correctly, v2. drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3. drivers/gpu/drm/i915/intel_atomic.c | 4 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 22 +++++---- drivers/gpu/drm/i915/intel_display.c | 81 +++++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 24 +++++++-- drivers/gpu/drm/i915/intel_fbc.c | 5 +- drivers/gpu/drm/i915/intel_pm.c | 34 +++++++++---- 6 files changed, 88 insertions(+), 82 deletions(-) -- 2.11.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx