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=-3.9 required=3.0 tests=BAYES_00,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 4C044C2D0A3 for ; Tue, 27 Oct 2020 01:17:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0491020872 for ; Tue, 27 Oct 2020 01:16:59 +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="kpPRu+qi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503715AbgJ0BQ7 (ORCPT ); Mon, 26 Oct 2020 21:16:59 -0400 Received: from ozlabs.org ([203.11.71.1]:56145 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409107AbgJ0BQ6 (ORCPT ); Mon, 26 Oct 2020 21:16:58 -0400 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 4CKv1g2Cbwz9sRK; Tue, 27 Oct 2020 12:16:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1603761416; bh=h8xyjrpuSTlQCEVJbKMBITShYWl4W1pNpWMa5O4i5Kg=; h=Date:From:To:Cc:Subject:From; b=kpPRu+qimF40ShKPvebpKGUO5QP6pBgqjCyigKJ/qAt3xWd79haEEqbDd8ICDyUGh PCZc7+vQ9NvH6kDrzONHogQHh8Ygh3A7awKODXGAJZjPQOCg8pxHfNoNV8ksRUBAZI NWH63TBNsObJjdkqclHpQFz8roHV4/h9R1DuWE/0RMxLgwc7Ec276+KbCMqIjk8Q5U LcuxhZEvASx0qit6td/YjvtyCzn938yJpxVH/Q5FqnWWLAY8Sok++ZUoE15bPVW6jd DIp07GWpNom8Wph4d+E1Vw8Dee67EjTuIUOR1ea6vDR05hWm++jygOnpqG0rfJSZ0C wISHl8/C60gAg== Date: Tue, 27 Oct 2020 12:16:53 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List , Ville =?UTF-8?B?U3lyasOkbMOk?= , Dave Airlie Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20201027121653.02108274@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/eyURcSdGIGG_KJ/feEncUOg"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/eyURcSdGIGG_KJ/feEncUOg Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_dp_helper.h between commit: a77ed90da6bb ("drm/dp: Define protocol converter DPCD registers") from Linus' tree and commit: 6e5702980b14 ("drm/dp: add subheadings to DPCD address definitions") from the drm-misc 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 include/drm/drm_dp_helper.h index da53aebb7230,ae4e20245ba3..000000000000 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@@ -1003,16 -1035,7 +1054,17 @@@ struct drm_device #define DP_CEC_TX_MESSAGE_BUFFER 0x3020 #define DP_CEC_MESSAGE_BUFFER_LENGTH 0x10 =20 +#define DP_PROTOCOL_CONVERTER_CONTROL_0 0x3050 /* DP 1.3 */ +# define DP_HDMI_DVI_OUTPUT_CONFIG (1 << 0) /* DP 1.3 */ +#define DP_PROTOCOL_CONVERTER_CONTROL_1 0x3051 /* DP 1.3 */ +# define DP_CONVERSION_TO_YCBCR420_ENABLE (1 << 0) /* DP 1.3 */ +# define DP_HDMI_EDID_PROCESSING_DISABLE (1 << 1) /* DP 1.4 */ +# define DP_HDMI_AUTONOMOUS_SCRAMBLING_DISABLE (1 << 2) /* DP 1.4 */ +# define DP_HDMI_FORCE_SCRAMBLING (1 << 3) /* DP 1.4 */ +#define DP_PROTOCOL_CONVERTER_CONTROL_2 0x3052 /* DP 1.3 */ +# define DP_CONVERSION_TO_YCBCR422_ENABLE (1 << 0) /* DP 1.3 */ + + /* HDCP 1.3 and HDCP 2.2 */ #define DP_AUX_HDCP_BKSV 0x68000 #define DP_AUX_HDCP_RI_PRIME 0x68005 #define DP_AUX_HDCP_AKSV 0x68007 --Sig_/eyURcSdGIGG_KJ/feEncUOg Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+XdQUACgkQAVBC80lX 0GxM8Af7BpAFcF31vfAklBSUUuavpTugxLNrHkyzhVSF0q3yEmm324CMIgYGT0YY 7k9q0sdsqTa8CXYxkvuLFjhIS/ZkvwbMgzphXe23hMnhXs+mHvqcFAd8dXuVVxwH iu0SzprR/qt1MJc0ILXJBO02K8YgFOxFmiUqDdtb+viBxzgRg/ZD1UhqaOFrj57m 7QaH4Kl75PYpLLKHCQFTI/ZwWRspR4/52wt1T8PIYCIPYo1quMTQJGk67OS3ytFO kTXa6xoGfeproe/qyMM/ENnzanc33CZHXOZltFOkhwTO3VxOxfVebZMqfhJn7HvB TAEdcAivWJ4JKXE6rNg9aGXYGGKaxA== =wfcx -----END PGP SIGNATURE----- --Sig_/eyURcSdGIGG_KJ/feEncUOg--