The drm-intel merge keeps the full update clip_area_update() call that
drm-intel-fixes has under the skip_su_area_calc label. In drm-intel,
commit dd038a8d440a ("drm/i915/psr: Merge the selective fetch area
across joined pipes") replaced that call with a plain assignment of
display_area to psr2_su_area, which now sits right above it, so the
leftover clip only repeats what the assignment already did.
Drop it to match the drm-intel version of the function.
Fixes: 9665afc4c1d9 ("Merge branch 'for-linux-next' of
https://gitlab.freedesktop.org/drm/i915/kernel.git";)
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Sasha Levin <[email protected]>
---
Mark, this applies on top of next-20261102 and is meant to be folded into
the drm-intel merge. The resolution in your mail kept both the
skip_su_area_calc label and the clip under it. The label was gone by the
time next-20261102 went out, but the clip stayed behind.
With this, intel_psr.c is identical to the drm-intel for-linux-next
version. No functional change, since the clip is a no-op after the
assignment. Built with W=1 on x86_64 defconfig.
drivers/gpu/drm/i915/display/intel_psr.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
b/drivers/gpu/drm/i915/display/intel_psr.c
index 6fbaa262b31bd..288836d4a993c 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -3133,10 +3133,6 @@ static int psr2_sel_fetch_apply_su_area(struct
intel_atomic_state *state,
if (full_update)
crtc_state->psr2_su_area = display_area;
- if (full_update)
- clip_area_update(&crtc_state->psr2_su_area, &display_area,
- &display_area);
-
/*
* Now that we have the pipe damaged area check if it intersect with
* every plane, if it does set the plane selective fetch area.
base-commit: 2637bdec0535a2044cd830eba9a79363651d9043
--
2.53.0
