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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32E84C433F5 for ; Tue, 5 Apr 2022 01:50:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229456AbiDEBwt (ORCPT ); Mon, 4 Apr 2022 21:52:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbiDEBws (ORCPT ); Mon, 4 Apr 2022 21:52:48 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1FA9386347; Mon, 4 Apr 2022 18:07:47 -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 4KXTf92gnvz4xXK; Tue, 5 Apr 2022 10:53:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1649120003; bh=yWJj/XDly7PKBcBsIePwdijaqceEq7HoP2lgWDGUzjE=; h=Date:From:To:Cc:Subject:From; b=oZySHRRqJoqMe0goHMP66Ql+m2+0q3c8gww/7QVi+MZFoTWHqTeBgi9TpY2eRnnm6 wp2Zn47wayZsgwnh6hqJQb7jtrfKpnEMLgANRZ1CAJlvXDF1qla1k5jjpcgM0UFMqm 98/q8uvVAQcYMUjDwVgXpMV8uihbFemo3f3JS11wrre2Pf6dwZa5gnQoMLbzgiKmbT D4oybWFSxPZukv+gOxkpYc8BhDyeaCJOURTFjOL/dOMY6uD5Js/r/xKA7fKXJOh2VM YpqyAqNFeCda1qywMI2OHQIQSw2DY69ls+hPgCRQ01fy9p+2VzVA3uHBXMSCnxEmMp KUBE7+uoUPvAA== Date: Tue, 5 Apr 2022 10:53:19 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Juha-Pekka =?UTF-8?B?SGVpa2tpbMOk?= , Linux Kernel Mailing List , Linux Next Mailing List , Lucas De Marchi , Matt Roper , Ramalingam C , Robert Beckett , Stanislav Lisovskiy Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20220405105319.2eb47e9d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/j==zcLUSd_ZwS9jYUrBZVK3"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/j==zcLUSd_ZwS9jYUrBZVK3 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/i915/i915_pci.c between commit: 132aaaf01788 ("drm/i915: add needs_compact_pt flag") from Linus' tree and commits: 072ce4164f97 ("drm/i915/dg2: Tile 4 plane format support") 412c942bdfae ("drm/i915/ats-m: add ATS-M platform info") from the drm-intel tree. I fixed it up (I think, 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/i915/i915_pci.c index c32c0c6661c8,8e321d300e0c..000000000000 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@@ -1040,25 -1038,35 +1040,36 @@@ static const struct intel_device_info x .require_force_probe =3D 1, }; =20 + #define DG2_FEATURES \ + XE_HP_FEATURES, \ + XE_HPM_FEATURES, \ + DGFX_FEATURES, \ + .graphics.rel =3D 55, \ + .media.rel =3D 55, \ + PLATFORM(INTEL_DG2), \ + .has_4tile =3D 1, \ + .has_64k_pages =3D 1, \ ++ .needs_compact_pt =3D 1, \ + .has_guc_deprivilege =3D 1, \ + .platform_engine_mask =3D \ + BIT(RCS0) | BIT(BCS0) | \ + BIT(VECS0) | BIT(VECS1) | \ + BIT(VCS0) | BIT(VCS2) +=20 __maybe_unused static const struct intel_device_info dg2_info =3D { - XE_HP_FEATURES, - XE_HPM_FEATURES, + DG2_FEATURES, XE_LPD_FEATURES, - DGFX_FEATURES, - .graphics.rel =3D 55, - .media.rel =3D 55, - PLATFORM(INTEL_DG2), - .has_guc_deprivilege =3D 1, - .has_64k_pages =3D 1, - .needs_compact_pt =3D 1, - .platform_engine_mask =3D - BIT(RCS0) | BIT(BCS0) | - BIT(VECS0) | BIT(VECS1) | - BIT(VCS0) | BIT(VCS2), - .require_force_probe =3D 1, .display.cpu_transcoder_mask =3D BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | BIT(TRANSCODER_C) | BIT(TRANSCODER_D), + .require_force_probe =3D 1, + }; +=20 + __maybe_unused + static const struct intel_device_info ats_m_info =3D { + DG2_FEATURES, + .display =3D { 0 }, + .require_force_probe =3D 1, }; =20 #undef PLATFORM --Sig_/j==zcLUSd_ZwS9jYUrBZVK3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJLkwAACgkQAVBC80lX 0GwCmwf/YLukNlv4VfvGolLJqjb0d4+V3vRIOgWor4TZgbiIvKvEI7wcYjf1Xotp hw7jpLNt7ameGWV5+pKmYmUybFgjJJofMSI0cQaYkByRfT7Yml3Ov29TbNV3Pfu+ lSCt7asqLuubKGMfov41OxfkDtKK6aaCbAOPmO0yORo6rHVWkce1hRHSCXTfBGKX nNrqGYiHCZud8k8V7he8P3Zf2tBqz4FJ1o5nzoKled5MT8mSux8NyFTinbDdwIAe 3hbbWcOgqQqlROVkTcjLWbDP4F4xFMUFTofnZzaS1nBRpmK+ZN3a8dbRzaP/jISD B0q4OkRNTVifbgmONUvcm9I+VX65uw== =R9kd -----END PGP SIGNATURE----- --Sig_/j==zcLUSd_ZwS9jYUrBZVK3--