From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A10EAC55185 for ; Thu, 23 Apr 2020 02:13:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B7AE2075A for ; Thu, 23 Apr 2020 02:13:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="mExy4KoW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726002AbgDWCNz (ORCPT ); Wed, 22 Apr 2020 22:13:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725781AbgDWCNz (ORCPT ); Wed, 22 Apr 2020 22:13:55 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1840AC03C1AA; Wed, 22 Apr 2020 19:13:55 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49717g1mmRz9sSd; Thu, 23 Apr 2020 12:13:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1587608033; bh=xVuTqNfiwREg9OUyvTo3nmF/OVJaGHdlQk6JpY9joko=; h=Date:From:To:Cc:Subject:From; b=mExy4KoWKorVGiMLvmJogm4dmaC3orsjrkDTll7uYDL9ExSd4FzUL95NnerdYMOtE YOgfvsKn4+Hjuv4FVF7M2MnSGeGamBXGCcYhRzh5oVRQk0DjmcktND8lgVT7QMYpib g1LNv2zcPmhvkSofRFZjCGpoMFIflrXrRYArAEglieecKwfdqJHF+OtByZQBF0kr/F BxcMre6kPlKIxFvrpI4EfXvmsiMBVrUu9gBrOH8HmGeCsQrvbSNHJwkHltpPPxfE6L upKPJZjul49PjHPRWDmfH+QRjXbgMGHRTFK9nQZWe0s5Ro96q3WEgZqW2AAxJ3ZUyZ czivDrn3coC/w== Date: Thu, 23 Apr 2020 12:13:46 +1000 From: Stephen Rothwell To: Alex Deucher , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Lyude Paul Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20200423121346.42e35467@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/+aoijb5RJMBtS7MePMMZmj8"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/+aoijb5RJMBtS7MePMMZmj8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c between commit: 09b974e8983a ("drm/amd/amdgpu_dm/mst: Remove ->destroy_connector() callba= ck") from the drm tree and commit: c33f212c0c92 ("drm/amdgpu/display: create fake mst encoders ahead of time= ") from the amdgpu 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 3db1ec35d2b4,4f0072a9396b..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@@ -136,23 -93,14 +93,20 @@@ static ssize_t dm_dp_aux_transfer(struc static void dm_dp_mst_connector_destroy(struct drm_connector *connector) { - struct amdgpu_dm_connector *amdgpu_dm_connector =3D to_amdgpu_dm_connect= or(connector); + struct amdgpu_dm_connector *aconnector =3D + to_amdgpu_dm_connector(connector); - struct amdgpu_encoder *amdgpu_encoder =3D aconnector->mst_encoder; + + if (aconnector->dc_sink) { + dc_link_remove_remote_sink(aconnector->dc_link, + aconnector->dc_sink); + dc_sink_release(aconnector->dc_sink); + } =20 - kfree(amdgpu_dm_connector->edid); - amdgpu_dm_connector->edid =3D NULL; + kfree(aconnector->edid); =20 - drm_encoder_cleanup(&amdgpu_encoder->base); - kfree(amdgpu_encoder); drm_connector_cleanup(connector); - drm_dp_mst_put_port_malloc(amdgpu_dm_connector->port); - kfree(amdgpu_dm_connector); + drm_dp_mst_put_port_malloc(aconnector->port); + kfree(aconnector); } =20 static int @@@ -412,10 -358,11 +364,19 @@@ dm_dp_add_mst_connector(struct drm_dp_m master->dc_link, master->connector_id); =20 - aconnector->mst_encoder =3D dm_dp_create_fake_mst_encoder(master); - drm_connector_attach_encoder(&aconnector->base, - &aconnector->mst_encoder->base); + for (i =3D 0; i < AMDGPU_DM_MAX_CRTC; i++) { + drm_connector_attach_encoder(&aconnector->base, + &aconnector->mst_encoders[i].base); + } +=20 ++ connector->max_bpc_property =3D master->base.max_bpc_property; ++ if (connector->max_bpc_property) ++ drm_connector_attach_max_bpc_property(connector, 8, 16); ++ ++ connector->vrr_capable_property =3D master->base.vrr_capable_property; ++ if (connector->vrr_capable_property) ++ drm_connector_attach_vrr_capable_property(connector); + connector->max_bpc_property =3D master->base.max_bpc_property; if (connector->max_bpc_property) drm_connector_attach_max_bpc_property(connector, 8, 16); --Sig_/+aoijb5RJMBtS7MePMMZmj8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6g+doACgkQAVBC80lX 0GzYsgf9HPCUYzxjIj08o53T96k048Rm4Ej9PAukiAH3p53qvOcyKzcQVuZQP8JB uxZkddWLjhkzV3JLfdchTyV/e4UWkF+v8GaUfOYzPWwde94LkmMtDGiPtD8uCen0 61/wCiLg1XbjiuQJtmtRdAEiK3elwI2OKtK/yNvq0Ue9Vau2OpqozKjqeE+pH+xc RP4m72sCXJ6ntOKyT14aKyZGpEZ29zBwN+mnoEoyg0DZVfS4SQcnjuzgQSYKBUdT Fg9WUq61pUCz7+dpJpeprZA5QsQR2I0xtt4O5F/kFdG7GVPd+4YlT+763rF0G9q0 lriWtDXPBTtwGwjB3bXmXCghrc5l4A== =MkmL -----END PGP SIGNATURE----- --Sig_/+aoijb5RJMBtS7MePMMZmj8--