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 459E7C433F5 for ; Thu, 2 Dec 2021 00:31:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354507AbhLBAfD (ORCPT ); Wed, 1 Dec 2021 19:35:03 -0500 Received: from gandalf.ozlabs.org ([150.107.74.76]:44915 "EHLO gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354594AbhLBAd6 (ORCPT ); Wed, 1 Dec 2021 19:33:58 -0500 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 4J4H0z2yvqz4xbw; Thu, 2 Dec 2021 11:30:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1638405028; bh=TjyNYyoyPBdzTBSQjZxt0J1gGbnbmg1ai8+DULrZFQE=; h=Date:From:To:Cc:Subject:From; b=oKdOa53zFtGsIZmX9ID9GitRZlzZ1gwC24CacCWaW/qVXT1JIwdJRl2IcJu3o3gFM liM+d9UoIhqcSn8clqgLt1nVDZIIPQlC2HT4Xj1rU6WhgEi7uWXH63zVbo9Hh9P5su 759pi3A/U9cPEloaw/ln79PVLfQgxW1elqEB8VZRU+k0pv/0whHUt/eNYTXVAkYWyY 2FiUW3a6EjHOenGhPcu3C+m1mKnT+kWptDGiJRJ4L5zS+MfHgxKAkjgsunt1mUkF5o ThhzaDjizIjtfE51Q6BRwqojTqDIzF6kyCjEjf/A4julYTbClnax4fHoWkQE2IlvUN pmQ4fnOqhLA3g== Date: Thu, 2 Dec 2021 11:30:25 +1100 From: Stephen Rothwell To: Joonas Lahtinen , Daniel Vetter , Jani Nikula , Rodrigo Vivi , Intel Graphics , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Tvrtko Ursulin , Ville =?UTF-8?B?U3lyasOkbMOk?= Subject: linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree Message-ID: <20211202113025.71551241@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/U5W8j29yaPF/IG8K8AyEq1R"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/U5W8j29yaPF/IG8K8AyEq1R Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-intel-gt tree got a conflict in: drivers/gpu/drm/i915/display/intel_fbc.c between commit: d06188234427 ("drm/i915/fbc: s/dev_priv/i915/") from the drm-intel tree and commit: cca084692394 ("drm/i915: Use per device iommu check") from the drm-intel-gt 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/i915/display/intel_fbc.c index d0c34bc3af6c,c40444206425..000000000000 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@@ -1674,12 -1536,12 +1674,12 @@@ static int intel_sanitize_fbc_option(st return 0; } =20 -static bool need_fbc_vtd_wa(struct drm_i915_private *dev_priv) +static bool need_fbc_vtd_wa(struct drm_i915_private *i915) { /* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */ - if (intel_vtd_active() && - if (intel_vtd_active(dev_priv) && - (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) { - drm_info(&dev_priv->drm, ++ if (intel_vtd_active(i915) && + (IS_SKYLAKE(i915) || IS_BROXTON(i915))) { + drm_info(&i915->drm, "Disabling framebuffer compression (FBC) to prevent screen flicker wi= th VT-d enabled\n"); return true; } --Sig_/U5W8j29yaPF/IG8K8AyEq1R Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmGoE6EACgkQAVBC80lX 0GzXDAf+OlGafDDLWTuvxxMYe2NkmdpUhDLDa5gxcGmBfe3DzkoC6pompmP8DPBO /H+GR02MFdTl+y2rZkRLkHm2t0jQeiUXa9ccq99TiNaDf4FRGkx2xTRlDLqCfEcG TCWIT3oDyz/rilgDHpCLwp8zIMzw7CvCeDUSohdMhFId0zHobvKp2w9LluvLGndl s3EJk1DxJ4tPOxr80tRiqi4hypdHINwgQp+4YyagTqBD2yZMXfDdIDa81zDBPSrs A7yq3BHvDMuOYsvhvBvUmpCQq0AsCamdUwPTVZU7P7eT1xH2f+W9hcz639utU1ve 07H3g7yUpEY68XvDOw46KxjUZXZohA== =gaRM -----END PGP SIGNATURE----- --Sig_/U5W8j29yaPF/IG8K8AyEq1R--