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 EFD8716130C for ; Mon, 19 Aug 2024 10:19:23 +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=1724062764; cv=none; b=NFsZI8/kGEi4w6o+QyFbDHlar7XHCmpY2bwsnGvRv1n+q+H4ttUEvUICD7ydW0Ez4vcaqZdZxvGanVhSwdVRpYnQjh8dX8761bncAGPBj2VGjuJf/KkDYpQYMqGvEzHCC77FHhw97EnjiC5w7qH1V4vMoescZNwUl2bRoJEdAsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724062764; c=relaxed/simple; bh=MxvZynQ+UBKF0RzGkY+4ynBi+wMbZq9Dz4Ps7R4uIeo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=F4lXVm1wvBTyqHzehuiyfQrYkp1b7jo4AdCRN2oE6wO+tD4Y8lI1uUFUhvAowuoz1DFM749veb2QePc7qEw5W40KwVEtxUcPa5Wj/wVzCaquwZfW7CHfCpKwTlsOIb+oI4crUnuWxPmSl8uuroAHPFOIm5wwKjr6FCGdprPgXN0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XEf5IHXA; 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="XEf5IHXA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 258CFC4AF0E; Mon, 19 Aug 2024 10:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724062763; bh=MxvZynQ+UBKF0RzGkY+4ynBi+wMbZq9Dz4Ps7R4uIeo=; h=Subject:To:Cc:From:Date:From; b=XEf5IHXA5GDEdeuB9JrkiGpLtFWW1JIdsCKo9b9F/fICCTEfw+h3Gfivra3MmjqxO YFNmGs14VwSPu3ypPyz09BU01v+wICkGY8ULdHVwr91SHDhZmQAljxPC/ymHWHn5cc nRgliGPnC0+hilA1FbeDZ9sXc4TuPwavT7NoGvfQ= Subject: FAILED: patch "[PATCH] drm/amd/display: Adjust cursor position" failed to apply to 6.1-stable tree To: Rodrigo.Siqueira@amd.com,alexander.deucher@amd.com,chiahsuan.chung@amd.com,daniel.wheeler@amd.com,mario.limonciello@amd.com,wayne.lin@amd.com Cc: From: Date: Mon, 19 Aug 2024 12:19:12 +0200 Message-ID: <2024081912-custodian-handgrip-81cc@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.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x 56fb276d0244d430496f249335a44ae114dd5f54 # git commit -s git send-email --to '' --in-reply-to '2024081912-custodian-handgrip-81cc@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 56fb276d0244 ("drm/amd/display: Adjust cursor position") e53524cdcc02 ("drm/amd/display: Refactor HWSS into component folder") 6e2c4941ce0c ("drm/amd/display: Move dml code under CONFIG_DRM_AMD_DC_FP guard") 1cb87e048975 ("drm/amd/display: Add DCN35 blocks to Makefile") 0fa45b6aeae4 ("drm/amd/display: Add DCN35 Resource") ec129fa356be ("drm/amd/display: Add DCN35 init") 6f8b7565cca4 ("drm/amd/display: Add DCN35 HWSEQ") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 56fb276d0244d430496f249335a44ae114dd5f54 Mon Sep 17 00:00:00 2001 From: Rodrigo Siqueira Date: Thu, 1 Aug 2024 16:16:35 -0600 Subject: [PATCH] drm/amd/display: Adjust cursor position [why & how] When the commit 9d84c7ef8a87 ("drm/amd/display: Correct cursor position on horizontal mirror") was introduced, it used the wrong calculation for the position copy for X. This commit uses the correct calculation for that based on the original patch. Fixes: 9d84c7ef8a87 ("drm/amd/display: Correct cursor position on horizontal mirror") Cc: Mario Limonciello Cc: Alex Deucher Acked-by: Wayne Lin Signed-off-by: Rodrigo Siqueira Signed-off-by: Tom Chung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher (cherry picked from commit 8f9b23abbae5ffcd64856facd26a86b67195bc2f) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c index 1b9ac8812f5b..14a902ff3b8a 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c @@ -3682,7 +3682,7 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) (int)hubp->curs_attr.width || pos_cpy.x <= (int)hubp->curs_attr.width + pipe_ctx->plane_state->src_rect.x) { - pos_cpy.x = 2 * viewport_width - temp_x; + pos_cpy.x = temp_x + viewport_width; } } } else {