From patchwork Fri Jun 21 13:21:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13707593 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 50ABBC27C4F for ; Fri, 21 Jun 2024 13:21:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EB1E10F188; Fri, 21 Jun 2024 13:21:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="JqVRAuVn"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 57C6410F188 for ; Fri, 21 Jun 2024 13:21:20 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A387D626B6; Fri, 21 Jun 2024 13:21:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8955CC2BBFC; Fri, 21 Jun 2024 13:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718976079; bh=eEBjK7L9zo7dYznjm4ZoCU0EEdJVjmtajHqCxc1dnhI=; h=Date:From:To:Cc:Subject:From; b=JqVRAuVnTHIw6D5/uqDKXXNm7JNokOfiLq8/btn0kxMfp1kd2uq1YrOaR0i2I9naV VcMeTW3EPsY69Hy87DN1ljANH5fesyYF+U/K9VlG4yqb0QcA903TyXcg2EwxCaIimy aZBdng5s5nySzZbIIxumy9Eq3qSkSGI9SflGzObEdz8F61YrGom6eaFDIwiAex84HH z43lJtMcpBYMRRSBarhkSHh3FfRk8nR3tfR+iSuX6uzSLA5OcleTC7af19fP4zsRIx YtftL3nqhr6BiHku+Pj3q+pyr+RI1cGTXSr7Tj7Tjr6Q7edwErule1YwdWjuYIuaUt OClFU/D2DXZEw== Date: Fri, 21 Jun 2024 14:21:14 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Alex Deucher , Dillon Varone , Linux Kernel Mailing List , Linux Next Mailing List , Michael Strauss , Nicholas Kazlauskas Subject: linux-next: manual merge of the drm tree with the drm-fixes 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 drm-fixes tree and commits: 47745acc5e8dd ("drm/amd/display: Add trigger FIFO resync path for DCN35") 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. diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c index 199781233fd5f..30e6a63988391 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c @@ -157,8 +160,8 @@ static const struct hwseq_private_funcs dcn35_private_funcs = { .set_mcm_luts = dcn32_set_mcm_luts, .setup_hpo_hw_control = dcn35_setup_hpo_hw_control, .calculate_dccg_k1_k2_values = dcn32_calculate_dccg_k1_k2_values, - .set_pixels_per_cycle = dcn32_set_pixels_per_cycle, - .is_dp_dig_pixel_rate_div_policy = dcn35_is_dp_dig_pixel_rate_div_policy, + .resync_fifo_dccg_dio = dcn314_resync_fifo_dccg_dio, + .is_dp_dig_pixel_rate_div_policy = dcn32_is_dp_dig_pixel_rate_div_policy, .dsc_pg_control = dcn35_dsc_pg_control, .dsc_pg_status = dcn32_dsc_pg_status, .enable_plane = dcn35_enable_plane,