From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [PATCH i915 v6 2/2] i915: wait for fence in prepare_plane_fb Date: Tue, 24 Nov 2015 11:05:21 +0100 Message-ID: <20151124100518.GB17658@ulmo.nvidia.com> References: <20151124085535.GF17050@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1364270863==" Return-path: Received: from hqemgate15.nvidia.com (hqemgate15.nvidia.com [216.228.121.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id C9D9F6E886 for ; Tue, 24 Nov 2015 02:05:31 -0800 (PST) In-Reply-To: <20151124085535.GF17050@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1364270863== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fdj2RfSjLxBAspz7" Content-Disposition: inline --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 24, 2015 at 09:55:35AM +0100, Daniel Vetter wrote: > On Mon, Nov 23, 2015 at 03:08:53PM -0800, Alex Goins wrote: > > In intel_prepare_plane_fb, if fb is backed by dma-buf, wait for exclusi= ve > > fence > >=20 > > v2: First commit > > v3: Remove object_name_lock acquire > > Move wait from intel_atomic_commit() to intel_prepare_plane_fb() > > v4: Wait only on exclusive fences, interruptible with no timeout > > v5: Style tweaks to more closely match rest of file > > v6: Properly handle interrupted waits > >=20 > > Signed-off-by: Alex Goins > > --- > > drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > >=20 > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i91= 5/intel_display.c > > index bacf336..604186b 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -13347,6 +13347,17 @@ intel_prepare_plane_fb(struct drm_plane *plane, > > if (!obj) > > return 0; > > =20 > > + /* For framebuffer backed by dmabuf, wait for fence */ > > + if (obj->base.dma_buf) { > > + ret =3D reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv, > > + false, true, > > + MAX_SCHEDULE_TIMEOUT); > > + if (ret =3D=3D -ERESTARTSYS) > > + return ret; > > + > > + WARN_ON(ret < 0); > > + } > > + > > mutex_lock(&dev->struct_mutex); > > =20 > > if (plane->type =3D=3D DRM_PLANE_TYPE_CURSOR && > > --=20 > > 1.9.1 > >=20 > >=20 > > -----------------------------------------------------------------------= ------------ > > This email message is for the sole use of the intended recipient(s) and= may contain > > confidential information. Any unauthorized review, use, disclosure or = distribution > > is prohibited. If you are not the intended recipient, please contact t= he sender by > > reply email and destroy all copies of the original message. > > -----------------------------------------------------------------------= ------------ >=20 > This disclaimer here pretty much tells me this isn't for public > consumption and I can't merge this patch ... Would be good if you can make > the final submission without this. Easiest way is usually to send the > patches out over your private mail account (but with git author and sob > still @nvidia.com). Alternatively to the private account there's a way to prevent the corporate email system from attaching the confidentiality statement. I've sent instructions to Alex internally. Thierry --fdj2RfSjLxBAspz7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWVDZXAAoJEN0jrNd/PrOh3PYP/26i8qfkcVWTBDeCpyZ1rdkY G2eRpiGoKPAGynPjYyxHJVQ/WSsHnOmejcyNFxnmTtUc/FC52JaCJFjPtF89h0in BingOX0LBngxuGQevvcpVLhBhScTIhGOBECQYNTq2EpfmfHfutEvmjt0OGm4I81R nhh38ZPvgNfoQw0QAi8JBDkphtoQujD7z6pg4dPFU2o4E8Zb4/Vc1N3h1T/UJNWf aQ6nIrzuvcwAxgkID9Gb74NmGHreELPi1NZj53ACx9zfbze7RE15hft16JK8Z/ai H1O004u9ffgqIE6i55VGy73Hu2X4xd/j9QGelbGEIFlEWZ+MrUAufxn5WL7usnPV Aknh/Caqn0oZJbumLjY9PnmeP/icjK4tr+fssZp6Y+iFmwisdaVxHW6azWjdFYQN BVaMYYS8H5+mUgzIK0t2x061zkQDvTxW/u39ISehqbV+jiY69vHTLbJDEY1/cFJY 7ndJfaE95tFVm6h1zSRAk1ohvv9sq9UtTnbB7WVQEjpvWAJdsSKXNqpA6H9cdEkc pveE2Av7Oxln/MkDG3b1xt8RQEjF1BziC1VizqG2TiZvsH08ir7tKvBbqENXVg2u AJmJFaF8Xsq77hyaO+9LPC6L8PFSjqSWx9qWLh9UmSBTH3l0ucH4nVOARmAbXdzA aPpk5NbNxce+t403b3oj =RR6X -----END PGP SIGNATURE----- --fdj2RfSjLxBAspz7-- --===============1364270863== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK --===============1364270863==--