From patchwork Thu Jun 27 15:06:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13714616 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 46B17C3064D for ; Thu, 27 Jun 2024 15:06:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7298A10E0F7; Thu, 27 Jun 2024 15:06:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="rSrvCMgN"; dkim-atps=neutral Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DD6D10E0F7 for ; Thu, 27 Jun 2024 15:06:43 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 4E84DCE2F7A; Thu, 27 Jun 2024 15:06:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97395C32786; Thu, 27 Jun 2024 15:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719500796; bh=Gm2UFxhA+RaA9MN0RMcn3u6Nvg2T9TqR9643ksfP5cE=; h=Date:From:To:Cc:Subject:From; b=rSrvCMgNNT2qxLrnn2He3h4Rb9n202E6mjGezePttfjt7jd4jXvZkNS7WIs8zbLVb 1UxWtBBk1aMlYdC/v+F9D0M3OoU9bKoH5P13MBeVUZLsYf3PqVHui3oD0z5Rzc6rGN usBUeKl3PhMh5xqNcbMO61p2R6KlW/BV6Asi+P+SkKvD+lMeTaB6msoqNON3EIe3cx tBBeZhtRyGCYO5cx6k/SiVJKIIW/6i1V1idNVyVwek4qJTq24rZNruxx68apLBVfJj YWyqV14phrHuRYs5afm/Fz3n8t77bCPX2DNCXz3DsWZNxRYZldrCvkdL2/OpQhf/KT WtVSJFqQ/iVzQ== Date: Thu, 27 Jun 2024 16:06:31 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Alex Deucher , Dillon Varone , Linux Kernel Mailing List , Linux Next Mailing List , Michael Strauss Subject: linux-next: manual merge of the drm tree with the origin tree Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c between commit: c03d770c0b014 ("drm/amd/display: Attempt to avoid empty TUs when endpoint is DPIA") from the origin tree and commit: 0127f0445f7c1 ("drm/amd/display: Refactor input mode programming for DIG FIFO") from the drm tree. I fixed it up (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. +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c diff --cc drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c index 199781233fd5f,428912f371291..0000000000000 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c