From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590243; b=gN4e++CYmQLB6eRMkEHK8wp06k83bKtssYzxMInrobcLjX7hLMz0eQKV0P1NJJK27/G8 c98NKNOWeQHN4cYB1/jN5G71Nh8dPc9hMa4tJp+NTmChP73mc78GRoRppJ3ayuVERbytg Ms7WbcDKEArYYmyWY26Hqp/771q3hu/wFlJpbLD11tWOk0MqnhI3aWsALQ/jaKqskgXrB HJFviEgICAplmUqKrffHS+tEMAHfKKtssOjoMSvwJ2ngKyyXacfKlWQBJMnJbvmB3xBZs vxNbtJu8nAzxzZXod8WPt6sHFnwvnw0VwVuTc91XKi08dh4F8+aiBTcXTto8TS/6tvQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590243; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=Nqbp+91G1yeXvY0KCAFSzfSjE7JatZXbP+oI+eNOZbo=; b=RsRuIg5J53DlErPM+Di7OC4zucOaWp8RrnhKb2OOEAUrSrbe/QM5VVGjdKz0KZlBxI+h 2FI8BVZsRDqLI3Muebk76+Vsoit/ZqWBUWSSSRSuZhywJtNq+AB46qhz1frS+sslrTQsN 5v1zNSqZ31/0J1Q5v8QsquUFFvWCGLNp7CbK5Bk+luXPE3zW4+4tfOG1JxVOUsRLSlpw2 i+4vU7KgEWv/1LdB+NNoZxbZqLlTNoMOpMlt1ptiDN3vss2hU0WM4lhi0ASiTHiEp//V6 Pp4gVMYt92+kHn5RuUIYSbe++PZ2FyU8ZH3YR4YB/FX8mCqwiBYnt9okPbSJV2z0zfw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=bjzFJhoB; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E5796075E2C; Fri, 13 Nov 2026 17:17:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=bjzFJhoB Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF2F61F000C4; Fri, 13 Nov 2026 17:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590243; bh=Nqbp+91G1yeXvY0KCAFSzfSjE7JatZXbP+oI+eNOZbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bjzFJhoB8VZWSZV4ARXT8GnYxCn57KSBpwx83M53vGxXjSPtckfkgABwiEL4Lh/9Q lac081PN0vV4k09AY+T4DMwEdvJVlQF1JIAFraxHuQP/r4hHTctgk+rfV+YFnaY1n4 LivvdpRYfeHTBCkoooNT44Rurd/nVMDeCFEwoPJk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Jouni=20H=C3=B6gander?= , Mika Kahola , Joonas Lahtinen , Sasha Levin Subject: [PATCH 6.18 241/686] drm/i915/psr: Dont clip plane state destination rectangle Date: Fri, 13 Nov 2026 10:46:14 -0500 Message-ID: <20261113153829.222597707@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jouni Högander [ Upstream commit e30830d21860fbf030ad162c3db4d1219477dfb5 ] clip_area_update() uses drm_rect_intersect which modifies passed r1 rectangle. Early transport alignment passes the cursor uapi.dst rectangle to clip_area_update, so the cursor uapi.dst is unintentionally modified by drm_rect_intersect. Fix this by using local copy in clip_area_update(). Also make the damage and the display area const. Fixes: 1bff93b8bc27 ("drm/i915/psr: Extend SU area to cover cursor fully if needed") Cc: # v6.9+ Assisted-by: GitHub-Copilot:claude-opus-5 Signed-off-by: Jouni Högander Reviewed-by: Mika Kahola Link: https://patch.msgid.link/20260929094434.77129-9-jouni.hogander@intel.com (cherry picked from commit 8621f3bcea6b0a790a954ddf2e6514c20a24ac1a) Signed-off-by: Joonas Lahtinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/display/intel_psr.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index d1a9f9de75b9a..ebade0f4e70ba 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -2592,23 +2592,25 @@ static u32 psr2_pipe_srcsz_early_tpt_calc(struct intel_crtc_state *crtc_state, } static void clip_area_update(struct drm_rect *overlap_damage_area, - struct drm_rect *damage_area, - struct drm_rect *display_area) + const struct drm_rect *damage_area, + const struct drm_rect *display_area) { - if (!drm_rect_intersect(damage_area, display_area)) + struct drm_rect inter = *damage_area; + + if (!drm_rect_intersect(&inter, display_area)) return; if (overlap_damage_area->y1 == -1) { - overlap_damage_area->y1 = damage_area->y1; - overlap_damage_area->y2 = damage_area->y2; + overlap_damage_area->y1 = inter.y1; + overlap_damage_area->y2 = inter.y2; return; } - if (damage_area->y1 < overlap_damage_area->y1) - overlap_damage_area->y1 = damage_area->y1; + if (inter.y1 < overlap_damage_area->y1) + overlap_damage_area->y1 = inter.y1; - if (damage_area->y2 > overlap_damage_area->y2) - overlap_damage_area->y2 = damage_area->y2; + if (inter.y2 > overlap_damage_area->y2) + overlap_damage_area->y2 = inter.y2; } static bool intel_psr2_sel_fetch_pipe_alignment(struct intel_crtc_state *crtc_state) -- 2.53.0