From: Alvin Lee <alvin.lee2@amd.com>
Date: Mon, 29 Apr 2024 21:39:35 +0000 (-0400)
Subject: drm/amd/display: Don't offload flip if not only address update
X-Git-Tag: v6.11-rc1~141^2~25^2~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dd50e634cb46880f3364ce629b09a37a5b3f888;p=thirdparty%2Fkernel%2Flinux.git

drm/amd/display: Don't offload flip if not only address update

[WHAT & HOW]
Fast updates can consist of some stream updates as well (i.e., out_csc).
In these cases we should not offload the flip to FW as we can only
offload address only updates to FW.

Reviewed-by: Chris Park <chris.park@amd.com>
Acked-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alvin Lee <alvin.lee2@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 0f20a3d96d933..0208b28517ac6 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3664,6 +3664,10 @@ static void commit_planes_for_stream_fast(struct dc *dc,
 				break;
 			}
 		}
+		if (stream_update) {
+			/* more than address update, need to acquire FAMS2 lock */
+			should_offload_fams2_flip = false;
+		}
 	}
 
 	dc_exit_ips_for_hw_access(dc);