From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A881183CB1 for ; Mon, 12 Aug 2024 14:50:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723474201; cv=none; b=VNAqTy2EgssstDKXCV7iVJolwj9kYpilDEpLVQzTYH+4eLLxZ8OHlYExKmzwlYmRQrYbDYcUk6inkM8Pg3xKyFu/HOVjJn0KMRPiBRuULN+WRlsfp+QsG+gofTjzztDpsl1NT4bNzDXjXlLwYB6RUhje+Cqhp5JtJZ5F145KGy8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723474201; c=relaxed/simple; bh=EVYrda0UYkBQzA68cvlJDw73Pn3Gd5cPrbVR0IsVmmU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=RJY3ZaxnDkjbAKnkF0pQXW9KIszQERV15Flz4IQBU5XZpveiUKOGOdYpsIQzThidyXM8m+MWRqRaY/s2caqrCc8L38JbXqqg5tZ4JbN8Eh9OKqKSS5FF9DLL2LketDE9Jyfp+P5kSmOjZ9f/XngXaQYYIr8fUO8ifxWRaPRL3tk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Xo7D+Hbr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Xo7D+Hbr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F487C32782; Mon, 12 Aug 2024 14:50:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723474200; bh=EVYrda0UYkBQzA68cvlJDw73Pn3Gd5cPrbVR0IsVmmU=; h=Subject:To:Cc:From:Date:From; b=Xo7D+HbrqnnQN+gdO+Ce4A9Z3ZHobZvXrc1TdgWQ9W4VcuvwYxHW+i/SVOdPVj/ol TLG3mUmHSMb3pQSrz6J9bCU1roQEYiHyTLNAwU2edaTMkmEJ8vhLqAGalNnCDW6NVY PI7+GCq234w6u9xc/IKdaxPZkyr/7FAHDFvDtkpw= Subject: FAILED: patch "[PATCH] drm/amd/display: Fix cursor issues with ODMs and" failed to apply to 6.10-stable tree To: nevenko.stupar@amd.com,alex.hung@amd.com,alexander.deucher@amd.com,daniel.wheeler@amd.com,mario.limonciello@amd.com,sridevi.arvindekar@amd.com Cc: From: Date: Mon, 12 Aug 2024 16:48:34 +0200 Message-ID: <2024081233-lyrically-dispatch-9563@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y git checkout FETCH_HEAD git cherry-pick -x adcd67e0bbea5fb504d6de50e5ccf74ebf96bc29 # git commit -s git send-email --to '' --in-reply-to '2024081233-lyrically-dispatch-9563@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^.. Possible dependencies: adcd67e0bbea ("drm/amd/display: Fix cursor issues with ODMs and magnification") 70839da63605 ("drm/amd/display: Add new DCN401 sources") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From adcd67e0bbea5fb504d6de50e5ccf74ebf96bc29 Mon Sep 17 00:00:00 2001 From: Nevenko Stupar Date: Thu, 13 Jun 2024 17:19:42 -0400 Subject: [PATCH] drm/amd/display: Fix cursor issues with ODMs and magnification [WHY & HOW] Adjust hot spot positions between ODM slices when cursor magnification is used. Reviewed-by: Sridevi Arvindekar Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Alex Hung Signed-off-by: Nevenko Stupar Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c index 79a911e1a09a..5306c8c170c5 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c @@ -1177,6 +1177,15 @@ void dcn401_set_cursor_position(struct pipe_ctx *pipe_ctx) if (x_pos < 0) { pos_cpy.x_hotspot -= x_pos; + if ((odm_combine_on) && (hubp->curs_attr.attribute_flags.bits.ENABLE_MAGNIFICATION)) { + if (hubp->curs_attr.width <= 128) { + pos_cpy.x_hotspot /= 2; + pos_cpy.x_hotspot += 1; + } else { + pos_cpy.x_hotspot /= 2; + pos_cpy.x_hotspot += 2; + } + } x_pos = 0; }