From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with the drm tree Date: Thu, 22 Aug 2019 13:15:04 +1000 Message-ID: <20190822131504.13c1f47e@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/OZdfbKRhgv_ngs8_CRFNLlE"; protocol="application/pgp-signature"; micalg=pgp-sha256 Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Dave Airlie Cc: Linux Next Mailing List , Linux Kernel Mailing List , Christian =?UTF-8?B?S8O2bmln?= , Chris Wilson List-Id: dri-devel@lists.freedesktop.org --Sig_/OZdfbKRhgv_ngs8_CRFNLlE 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_vma.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm tree and commit: cd2a4eaf8c79 ("drm/i915: Report resv_obj allocation failure") 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/i915/i915_vma.c index 2645f4e850c2,252edef6c59e..000000000000 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@@ -926,14 -906,22 +906,22 @@@ int i915_vma_move_to_active(struct i915 if (unlikely(err)) return err; =20 - obj->write_domain =3D 0; if (flags & EXEC_OBJECT_WRITE) { - obj->write_domain =3D I915_GEM_DOMAIN_RENDER; -=20 - if (intel_fb_obj_invalidate(obj, ORIGIN_CS)) - __i915_active_request_set(&obj->frontbuffer_write, rq); + if (intel_frontbuffer_invalidate(obj->frontbuffer, ORIGIN_CS)) + i915_active_ref(&obj->frontbuffer->write, + rq->timeline, + rq); =20 - reservation_object_add_excl_fence(vma->resv, &rq->fence); ++ dma_resv_add_excl_fence(vma->resv, &rq->fence); + obj->write_domain =3D I915_GEM_DOMAIN_RENDER; obj->read_domains =3D 0; + } else { - err =3D reservation_object_reserve_shared(vma->resv, 1); ++ err =3D dma_resv_reserve_shared(vma->resv, 1); + if (unlikely(err)) + return err; +=20 - reservation_object_add_shared_fence(vma->resv, &rq->fence); ++ dma_resv_add_shared_fence(vma->resv, &rq->fence); + obj->write_domain =3D 0; } obj->read_domains |=3D I915_GEM_GPU_DOMAINS; obj->mm.dirty =3D true; --Sig_/OZdfbKRhgv_ngs8_CRFNLlE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1eCLgACgkQAVBC80lX 0GxuUQf9G4hRvr4DgYRyVDh+YJeCJAh1S5g40itC+tJH2QeeeYFIY+SmWICsK2MJ 3gV7RZmcvqNSNOWA/QebgIscbVKcXd53H07vNo4DO+tkd0Zq03JQ/d6NA0tWl2rE AM2UzcFwqTkTqiT9HZLyV65x2YWBfKxx/aPwDrJ7AdhKV3k1TG1qVWmO1WPfUoln I6y4igZIOLp+QHGaNYtQb2DsD3tal33Q2G33HfbgBl5qMgPgAnB3gmstBG5/8EMX 4P1vj0JsZ/Z9PfO1q5lT9k/wex3iwwBF24ohTUqgHl6xcjZYxrKJ0Fvnl3+EpXpW aJZDeXq2iKMn1DPMx7F9SNCkif9FRg== =KOQn -----END PGP SIGNATURE----- --Sig_/OZdfbKRhgv_ngs8_CRFNLlE--