From patchwork Mon Aug 26 01:10:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13776943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C4A8C5320E for ; Mon, 26 Aug 2024 01:10:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73B4489A1E; Mon, 26 Aug 2024 01:10:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="P1Qm8nvh"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id B34F010E023; Mon, 26 Aug 2024 01:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1724634625; bh=QPycLkrrFOAkAi5mF/lXserKCpvEqlB8+bfiPzXrEIo=; h=Date:From:To:Cc:Subject:From; b=P1Qm8nvhiItIUMUpNsrie5KbAuPdm4v1Emffpnx97OTN/YDo7CB7Himblb1LFVVj5 0ZQSEIF1gB4hulqww1dV+ReHM3O6g2Vpi6hkzYWCS+M4vgNNYqg/4aXOHJ5k+NHdtG VcdzPqwtk7zeY3DP3mVX57Uhy7VF8FiaaIkPymZyliNp532sDeMnUUV7pFC3B9WOJ+ s2YMNXS4yytd7jsA9cUzdwlS9W97GisPD3DkuaL4flcK2O1WlXlyZ2626r1SY+ksuA soUUlzlO7wUje2NqaeZ2msiXHLMB5wbLxW9toTOLE6/qvB97AGj3lTrMSY9LZrtf/7 Z1xg+RzJJ80OA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WsXfS0JNQz4x6l; Mon, 26 Aug 2024 11:10:24 +1000 (AEST) Date: Mon, 26 Aug 2024 11:10:22 +1000 From: Stephen Rothwell To: Alex Deucher , Daniel Vetter Cc: Alex Deucher , Hamza Mahfooz , Leo Li , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Rodrigo Siqueira Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree Message-ID: <20240826111022.41db1e95@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c between commits: 537ef0f88897 ("drm/amd/display: use new vblank enable policy for DCN35+") e45b6716de4b ("drm/amd/display: use a more lax vblank enable policy for DCN35+") 58a261bfc967 ("drm/amd/display: use a more lax vblank enable policy for older ASICs") from the drm-misc tree and commit: 7fb363c57522 ("drm/amd/display: Let drm_crtc_vblank_on/off manage interrupts") from the amdgpu tree. I fixed it up (I think - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 34872eb4fc84,7d999e352df3..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c