drm/amd/display: remove need of modeset flag for overlay planes (V2)

[ Upstream commit a2a330ad66313084c9432b32862aa7e1255da9b4 ]

This patch is in continuation to the
"843e3c7 drm/amd/display: defer modeset check in dm_update_planes_state"
where we started to eliminate the dependency on
DRM_MODE_ATOMIC_ALLOW_MODESET to be set by the user space,
which as such is not mandatory.

After deferring, this patch eliminates the dependency on the flag
for overlay planes.

This has to be done in stages as its a pretty complex and requires thorough
testing before we free primary planes as well from dependency on modeset
flag.

V2: Simplified the plane type check.

Signed-off-by: Shirish S <shirish.s@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 79afffa00772c8d2ed590f0ab92d4d918a9de738..8dafb10b78325299ddf04dc817c497133074b774 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4037,7 +4037,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
                }
                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
 
-               if (!pflip_needed) {
+               if (!pflip_needed || plane->type == DRM_PLANE_TYPE_OVERLAY) {
                        WARN_ON(!dm_new_plane_state->dc_state);
 
                        plane_states_constructed[planes_count] = dm_new_plane_state->dc_state;
@@ -4783,7 +4783,8 @@ static int dm_update_planes_state(struct dc *dc,
 
                /* Remove any changed/removed planes */
                if (!enable) {
-                       if (pflip_needed)
+                       if (pflip_needed &&
+                           plane->type != DRM_PLANE_TYPE_OVERLAY)
                                continue;
 
                        if (!old_plane_crtc)
@@ -4830,7 +4831,8 @@ static int dm_update_planes_state(struct dc *dc,
                        if (!dm_new_crtc_state->stream)
                                continue;
 
-                       if (pflip_needed)
+                       if (pflip_needed &&
+                           plane->type != DRM_PLANE_TYPE_OVERLAY)
                                continue;
 
                        WARN_ON(dm_new_plane_state->dc_state);