On 10/22/2025 5:58, Gustavo Sousa wrote:
From: Luca Coelho <[email protected]>
Starting from display version 35, we don't need to use method1 to
calculate the watermark values anymore, so skip it.
Bspec: 68985
Signed-off-by: Luca Coelho <[email protected]>
Signed-off-by: Gustavo Sousa <[email protected]>
The change itself looks fine to me, so I'll give the RB. But, I'm still
unconvinced on the wordings of this commit title and it's message.
Reviewed-by: Shekhar Chauhan <[email protected]>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c
b/drivers/gpu/drm/i915/display/skl_watermark.c
index 5bb6cdc4ad2c..9a063637a9af 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1812,6 +1812,8 @@ static void skl_compute_plane_wm(const struct
intel_crtc_state *crtc_state,
if (wp->y_tiled) {
selected_result = max_fixed16(method2, wp->y_tile_minimum);
+ } else if (DISPLAY_VER(display) >= 35) {
+ selected_result = method2;
} else {
if ((wp->cpp * crtc_state->hw.pipe_mode.crtc_htotal /
wp->dbuf_block_size < 1) &&
