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=-4.1 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 3DD00C433E3 for ; Tue, 14 Jul 2020 02:59:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18030208FE for ; Tue, 14 Jul 2020 02:59:48 +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="JdXSRbsl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726785AbgGNC7r (ORCPT ); Mon, 13 Jul 2020 22:59:47 -0400 Received: from ozlabs.org ([203.11.71.1]:54853 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726150AbgGNC7q (ORCPT ); Mon, 13 Jul 2020 22:59:46 -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 4B5QGk17nqz9sRR; Tue, 14 Jul 2020 12:59:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594695584; bh=JytnyXM7mLZ22ITo74iTEVgYm2GIE3T8PylBD0v5KgY=; h=Date:From:To:Cc:Subject:From; b=JdXSRbslO/Pgp5vOwnzDhf5U0D9sLTudJWxJLalueYDscSrqSNH2kz8JrhYO7Z/hN m5a0qEq5QdveiQxXgEDXWO+PxDBv9iUbeuTDdWhXYm89CeFQj58Eao4sCeiPgeznpD C/MS5eQzOcQpJzHPTVDycp16AkWBhE1KSOYeQl1CD+AdA5EMVRYCuciVvJSdZh/PL0 7j7IuTHOxcO1bM8JbQGAHuc9Uch4iEZy0L8cTOkfVje/x03r8nDC231w9rtfEEoFcN m/fuySsulxwC36LDd/PiAs1b8h2nGPJ3zSC5GFox4o/vUuKP4afYI6oIs8MOfGwmtx dFBhm/kbFv1zQ== Date: Tue, 14 Jul 2020 12:59:41 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Laurent Pinchart , Sam Ravnborg , Lyude Paul Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20200714125941.2e95d167@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/TvsK9JqjR7N6ZoKB_AWExuI"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/TvsK9JqjR7N6ZoKB_AWExuI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/drm_probe_helper.c between commit: 12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs .mo= de_valid()") from the drm tree and commit: 1c26b8e09004 ("drm/probe_helper: Add drm_connector_helper_funcs.mode_vali= d_ctx") from the drm-intel 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/drm_probe_helper.c index 09e872e61315,601a4f25bb47..000000000000 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@@ -114,10 -116,8 +116,10 @@@ drm_mode_validate_pipeline(struct drm_d } =20 bridge =3D drm_bridge_chain_get_first_bridge(encoder); - ret =3D drm_bridge_chain_mode_valid(bridge, - &connector->display_info, - mode); - if (ret !=3D MODE_OK) { - *status =3D drm_bridge_chain_mode_valid(bridge, mode); ++ *status =3D drm_bridge_chain_mode_valid(bridge, ++ &connector->display_info, ++ mode); + if (*status !=3D MODE_OK) { /* There is also no point in continuing for crtc check * here. */ continue; --Sig_/TvsK9JqjR7N6ZoKB_AWExuI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8NH50ACgkQAVBC80lX 0GzXtAf+PoX61dmQpbPg7isR1p+Aj2H9XJqtIJtg07sPx1L99h57SexFt7fDSwOf lan4UNJQdY83y8IeWf5j1Jc4ra23HyiCTJFJvnoCXTSId5jpcYzeExKiAx3esXvu K8JP8/sa27GUYQueZLnq/6UOfc8YBA2j93KubDqJcnX0gh+BxucYdo/eozlFobfz NnDuLoLvnry6cGIsyEGiBBVrOwNKbXXahMw9awFfcJ7QPWQ+jBKXXpMmiuKvRTZc jZAzuK2vk7VUjyIoZC1tCuFc5bcPiCv0H5vDFrPNsg57wzuTCaW2gawKnXE9rtD0 pKtW57wQ541NuMcbVQZgaTJEMowjmg== =nBIt -----END PGP SIGNATURE----- --Sig_/TvsK9JqjR7N6ZoKB_AWExuI-- 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.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 59533C433E4 for ; Tue, 14 Jul 2020 02:59:49 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 15E46208FE for ; Tue, 14 Jul 2020 02:59:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="JdXSRbsl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15E46208FE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DC006E89B; Tue, 14 Jul 2020 02:59:48 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 746416E89B; Tue, 14 Jul 2020 02:59:47 +0000 (UTC) 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 4B5QGk17nqz9sRR; Tue, 14 Jul 2020 12:59:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594695584; bh=JytnyXM7mLZ22ITo74iTEVgYm2GIE3T8PylBD0v5KgY=; h=Date:From:To:Cc:Subject:From; b=JdXSRbslO/Pgp5vOwnzDhf5U0D9sLTudJWxJLalueYDscSrqSNH2kz8JrhYO7Z/hN m5a0qEq5QdveiQxXgEDXWO+PxDBv9iUbeuTDdWhXYm89CeFQj58Eao4sCeiPgeznpD C/MS5eQzOcQpJzHPTVDycp16AkWBhE1KSOYeQl1CD+AdA5EMVRYCuciVvJSdZh/PL0 7j7IuTHOxcO1bM8JbQGAHuc9Uch4iEZy0L8cTOkfVje/x03r8nDC231w9rtfEEoFcN m/fuySsulxwC36LDd/PiAs1b8h2nGPJ3zSC5GFox4o/vUuKP4afYI6oIs8MOfGwmtx dFBhm/kbFv1zQ== Date: Tue, 14 Jul 2020 12:59:41 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , Dave Airlie , DRI Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20200714125941.2e95d167@canb.auug.org.au> MIME-Version: 1.0 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: , Cc: Laurent Pinchart , Linux Next Mailing List , Sam Ravnborg , Linux Kernel Mailing List Content-Type: multipart/mixed; boundary="===============0084133494==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --===============0084133494== Content-Type: multipart/signed; boundary="Sig_/TvsK9JqjR7N6ZoKB_AWExuI"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/TvsK9JqjR7N6ZoKB_AWExuI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/drm_probe_helper.c between commit: 12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs .mo= de_valid()") from the drm tree and commit: 1c26b8e09004 ("drm/probe_helper: Add drm_connector_helper_funcs.mode_vali= d_ctx") from the drm-intel 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/drm_probe_helper.c index 09e872e61315,601a4f25bb47..000000000000 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@@ -114,10 -116,8 +116,10 @@@ drm_mode_validate_pipeline(struct drm_d } =20 bridge =3D drm_bridge_chain_get_first_bridge(encoder); - ret =3D drm_bridge_chain_mode_valid(bridge, - &connector->display_info, - mode); - if (ret !=3D MODE_OK) { - *status =3D drm_bridge_chain_mode_valid(bridge, mode); ++ *status =3D drm_bridge_chain_mode_valid(bridge, ++ &connector->display_info, ++ mode); + if (*status !=3D MODE_OK) { /* There is also no point in continuing for crtc check * here. */ continue; --Sig_/TvsK9JqjR7N6ZoKB_AWExuI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8NH50ACgkQAVBC80lX 0GzXtAf+PoX61dmQpbPg7isR1p+Aj2H9XJqtIJtg07sPx1L99h57SexFt7fDSwOf lan4UNJQdY83y8IeWf5j1Jc4ra23HyiCTJFJvnoCXTSId5jpcYzeExKiAx3esXvu K8JP8/sa27GUYQueZLnq/6UOfc8YBA2j93KubDqJcnX0gh+BxucYdo/eozlFobfz NnDuLoLvnry6cGIsyEGiBBVrOwNKbXXahMw9awFfcJ7QPWQ+jBKXXpMmiuKvRTZc jZAzuK2vk7VUjyIoZC1tCuFc5bcPiCv0H5vDFrPNsg57wzuTCaW2gawKnXE9rtD0 pKtW57wQ541NuMcbVQZgaTJEMowjmg== =nBIt -----END PGP SIGNATURE----- --Sig_/TvsK9JqjR7N6ZoKB_AWExuI-- --===============0084133494== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============0084133494==-- 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.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 497F7C433E5 for ; Tue, 14 Jul 2020 02:59:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1BB37208FE for ; Tue, 14 Jul 2020 02:59:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="JdXSRbsl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BB37208FE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA5AB6E89C; Tue, 14 Jul 2020 02:59:48 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 746416E89B; Tue, 14 Jul 2020 02:59:47 +0000 (UTC) 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 4B5QGk17nqz9sRR; Tue, 14 Jul 2020 12:59:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594695584; bh=JytnyXM7mLZ22ITo74iTEVgYm2GIE3T8PylBD0v5KgY=; h=Date:From:To:Cc:Subject:From; b=JdXSRbslO/Pgp5vOwnzDhf5U0D9sLTudJWxJLalueYDscSrqSNH2kz8JrhYO7Z/hN m5a0qEq5QdveiQxXgEDXWO+PxDBv9iUbeuTDdWhXYm89CeFQj58Eao4sCeiPgeznpD C/MS5eQzOcQpJzHPTVDycp16AkWBhE1KSOYeQl1CD+AdA5EMVRYCuciVvJSdZh/PL0 7j7IuTHOxcO1bM8JbQGAHuc9Uch4iEZy0L8cTOkfVje/x03r8nDC231w9rtfEEoFcN m/fuySsulxwC36LDd/PiAs1b8h2nGPJ3zSC5GFox4o/vUuKP4afYI6oIs8MOfGwmtx dFBhm/kbFv1zQ== Date: Tue, 14 Jul 2020 12:59:41 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , Dave Airlie , DRI Message-ID: <20200714125941.2e95d167@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree 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: , Cc: Laurent Pinchart , Linux Next Mailing List , Sam Ravnborg , Linux Kernel Mailing List Content-Type: multipart/mixed; boundary="===============0500527997==" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" --===============0500527997== Content-Type: multipart/signed; boundary="Sig_/TvsK9JqjR7N6ZoKB_AWExuI"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/TvsK9JqjR7N6ZoKB_AWExuI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/drm_probe_helper.c between commit: 12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs .mo= de_valid()") from the drm tree and commit: 1c26b8e09004 ("drm/probe_helper: Add drm_connector_helper_funcs.mode_vali= d_ctx") from the drm-intel 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/drm_probe_helper.c index 09e872e61315,601a4f25bb47..000000000000 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@@ -114,10 -116,8 +116,10 @@@ drm_mode_validate_pipeline(struct drm_d } =20 bridge =3D drm_bridge_chain_get_first_bridge(encoder); - ret =3D drm_bridge_chain_mode_valid(bridge, - &connector->display_info, - mode); - if (ret !=3D MODE_OK) { - *status =3D drm_bridge_chain_mode_valid(bridge, mode); ++ *status =3D drm_bridge_chain_mode_valid(bridge, ++ &connector->display_info, ++ mode); + if (*status !=3D MODE_OK) { /* There is also no point in continuing for crtc check * here. */ continue; --Sig_/TvsK9JqjR7N6ZoKB_AWExuI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8NH50ACgkQAVBC80lX 0GzXtAf+PoX61dmQpbPg7isR1p+Aj2H9XJqtIJtg07sPx1L99h57SexFt7fDSwOf lan4UNJQdY83y8IeWf5j1Jc4ra23HyiCTJFJvnoCXTSId5jpcYzeExKiAx3esXvu K8JP8/sa27GUYQueZLnq/6UOfc8YBA2j93KubDqJcnX0gh+BxucYdo/eozlFobfz NnDuLoLvnry6cGIsyEGiBBVrOwNKbXXahMw9awFfcJ7QPWQ+jBKXXpMmiuKvRTZc jZAzuK2vk7VUjyIoZC1tCuFc5bcPiCv0H5vDFrPNsg57wzuTCaW2gawKnXE9rtD0 pKtW57wQ541NuMcbVQZgaTJEMowjmg== =nBIt -----END PGP SIGNATURE----- --Sig_/TvsK9JqjR7N6ZoKB_AWExuI-- --===============0500527997== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0500527997==--