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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 BAD9BC47247 for ; Fri, 8 May 2020 03:50: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 6B29B2192A for ; Fri, 8 May 2020 03:50: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="Tbu/3oWl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B29B2192A 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 CE17F6E1BD; Fri, 8 May 2020 03:50:50 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5522E6E1B8; Fri, 8 May 2020 03:50:49 +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 49JGZS6pgTz9sRf; Fri, 8 May 2020 13:50:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1588909844; bh=Cmc1FVhoEKlY9s9LgXvIPNjxGWl3kjq2kdUKA+rElg0=; h=Date:From:To:Cc:Subject:From; b=Tbu/3oWlfZR1mjXnv3YcFtn8fPEOluy8oRvmFWgRtwSfXDQeR+qA4+NiccqOhIPOY qx29zz3YOITLmF1Q2fUN6mbBMv9Dw01bbh68z+f2G5tZQGpbciSx5EhZKesyZXCvtB fF17nmHg9uu2BJpGS9KcmFjbcfhtPU5X9mK2Du234PEEqkqPInnyM7JcGZ6aWGSx55 DXHJstkSYGHbK3lVEbZlcydQ4U6uKc0cbiMT+TegfsQ9dXy/+iq3kVl7snZzr/ArMv 3pG0u5BVFMyDoh6GMwZskeO1AaG4BAvLLKIjQzguDAJq0F6lu8/hZo3KXX1yYl0JPQ LHNM5DlBG+DCg== Date: Fri, 8 May 2020 13:50:38 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Message-ID: <20200508135038.7b6547bd@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes 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: Linux Next Mailing List , Linux Kernel Mailing List , Chris Wilson Content-Type: multipart/mixed; boundary="===============0671751025==" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" --===============0671751025== Content-Type: multipart/signed; boundary="Sig_/1K3goufP+ySveH8YfPl.3wn"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/1K3goufP+ySveH8YfPl.3wn Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_domain.c between commit: 47bf7b7a7151 ("drm/i915/gem: Remove object_is_locked assertion from unpin= _from_display_plane") from the drm-intel-fixes tree and commit: 9da0ea09639f ("drm/i915/gem: Drop cached obj->bind_count") from the drm 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/gem/i915_gem_domain.c index 4f96c8788a2e,af43e82f45c7..000000000000 --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c @@@ -368,7 -368,8 +368,7 @@@ static void i915_gem_object_bump_inacti struct drm_i915_private *i915 =3D to_i915(obj->base.dev); struct i915_vma *vma; =20 - if (!atomic_read(&obj->bind_count)) - GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj)); + if (list_empty(&obj->vma.list)) return; =20 mutex_lock(&i915->ggtt.vm.mutex); --Sig_/1K3goufP+ySveH8YfPl.3wn Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl601w4ACgkQAVBC80lX 0GwdVAgAmeyPSkyP3akZ3WA4t5E5ZXWpjmKjiUEI39WPVfg7hkbtiilDlJhl4h0L y9F2/mGtpCnITUIvX77XJaNLXc//+oTNxbr8k+MzDNbWzf4Gc9ILTbNMh+TuNFCI /vgVvGEn/B6GHPCMlZb7fxG+talqbCSz7iDaKzZXVPymuJNO8RhMZ9zzenoRUzNK CInTggZTP+D2N71QxZ1qj5VRA/n5yfbxhQiWXap7rgV39ZEtfE6Z/wGTWU4+Y4m6 B0f8lLTbj8KjFnlkxrWRxQW8nJy0pot2U/1mjHe9zmCP0hRPc8/pKvu6BSb7aqq9 2Y8tM9yinStAbQb/cNMcyXyraQzHjg== =xa1Z -----END PGP SIGNATURE----- --Sig_/1K3goufP+ySveH8YfPl.3wn-- --===============0671751025== 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 --===============0671751025==--