{
        struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
                                                                                 plane);
+       struct drm_plane_state *old_plane_state = drm_atomic_get_old_plane_state(state,
+                                                                                plane);
        bool is_cursor = plane->type == DRM_PLANE_TYPE_CURSOR;
        struct drm_crtc_state *crtc_state;
        int ret;
        if (!new_plane_state->fb || WARN_ON(!new_plane_state->crtc))
                return 0;
 
+       /*
+        * Ignore damage clips if the framebuffer attached to the plane's state
+        * has changed since the last plane update (page-flip). In this case, a
+        * full plane update should happen because uploads are done per-buffer.
+        */
+       if (old_plane_state->fb != new_plane_state->fb)
+               new_plane_state->ignore_damage_clips = true;
+
        crtc_state = drm_atomic_get_crtc_state(state,
                                               new_plane_state->crtc);
        if (IS_ERR(crtc_state))