drm/amd/display: ensure async flips are only accepted for fast updates

From Hamza Mahfooz
7ac1467f9472af5e7bee1ce923569677fc84fe5b in linux-6.1.y/6.1.53
a7c0cad0dc060bb77e9c9d235d68441b0fc69507 in mainline linux

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 9bde88b..d1f1c5f 100644 (file)
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7862,10 +7862,12 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
                 * fast updates.
                 */
                if (crtc->state->async_flip &&
-                   acrtc_state->update_type != UPDATE_TYPE_FAST)
+                   (acrtc_state->update_type != UPDATE_TYPE_FAST ||
+                    get_mem_type(old_plane_state->fb) != get_mem_type(fb)))
                        drm_warn_once(state->dev,
                                      "[PLANE:%d:%s] async flip with non-fast update\n",
                                      plane->base.id, plane->name);
+
                bundle->flip_addrs[planes_count].flip_immediate =
                        crtc->state->async_flip &&
                        acrtc_state->update_type == UPDATE_TYPE_FAST &&
@@ -9817,6 +9819,11 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
 
        /* Remove exiting planes if they are modified */
        for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
+               if (old_plane_state->fb && new_plane_state->fb &&
+                   get_mem_type(old_plane_state->fb) !=
+                   get_mem_type(new_plane_state->fb))
+                       lock_and_validation_needed = true;
+
                ret = dm_update_plane_state(dc, state, plane,
                                            old_plane_state,
                                            new_plane_state,
@@ -10068,9 +10075,20 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
                struct dm_crtc_state *dm_new_crtc_state =
                        to_dm_crtc_state(new_crtc_state);
 
+               /*
+                * Only allow async flips for fast updates that don't change
+                * the FB pitch, the DCC state, rotation, etc.
+                */
+               if (new_crtc_state->async_flip && lock_and_validation_needed) {
+                       drm_dbg_atomic(crtc->dev,
+                                      "[CRTC:%d:%s] async flips are only supported for fast updates\n",
+                                      crtc->base.id, crtc->name);
+                       ret = -EINVAL;
+                       goto fail;
+               }
+
                dm_new_crtc_state->update_type = lock_and_validation_needed ?
-                                                        UPDATE_TYPE_FULL :
-                                                        UPDATE_TYPE_FAST;
+                       UPDATE_TYPE_FULL : UPDATE_TYPE_FAST;
        }
 
        /* Must be success */

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
index b9b70f4..1ec643a 100644 (file)
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
@@ -406,18 +406,6 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
                return -EINVAL;
        }
 
-       /*
-        * Only allow async flips for fast updates that don't change the FB
-        * pitch, the DCC state, rotation, etc.
-        */
-       if (crtc_state->async_flip &&
-           dm_crtc_state->update_type != UPDATE_TYPE_FAST) {
-               drm_dbg_atomic(crtc->dev,
-                              "[CRTC:%d:%s] async flips are only supported for fast updates\n",
-                              crtc->base.id, crtc->name);
-               return -EINVAL;
-       }
-
        /* In some use cases, like reset, no stream is attached */
        if (!dm_crtc_state->stream)
                return 0;