From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753865AbdDLMy0 (ORCPT ); Wed, 12 Apr 2017 08:54:26 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:43871 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbdDLMyZ (ORCPT ); Wed, 12 Apr 2017 08:54:25 -0400 Message-ID: <1492001645.15082.14.camel@pengutronix.de> Subject: Re: [PATCH 2/3] drm/etnaviv: Expose our reservation object when exporting a dmabuf. From: Lucas Stach To: Daniel Vetter Cc: Eric Anholt , stable@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org Date: Wed, 12 Apr 2017 14:54:05 +0200 In-Reply-To: <20170412124715.j75nrmrdlycl4edm@phenom.ffwll.local> References: <20170411014414.20280-1-eric@anholt.net> <20170411014414.20280-2-eric@anholt.net> <20170412124715.j75nrmrdlycl4edm@phenom.ffwll.local> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:fa0f:41ff:fe58:4010 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Mittwoch, den 12.04.2017, 14:47 +0200 schrieb Daniel Vetter: > On Mon, Apr 10, 2017 at 06:44:13PM -0700, Eric Anholt wrote: > > Without this, polling on the dma-buf (and presumably other devices > > synchronizing against our rendering) would return immediately, even > > while the BO was busy. > > > > Signed-off-by: Eric Anholt > > Cc: stable@vger.kernel.org > > Cc: Lucas Stach > > Cc: Russell King > > Cc: Christian Gmeiner > > Cc: etnaviv@lists.freedesktop.org > > On the first 2 patches: > > Reviewed-by: Daniel Vetter > > If you get an ack from Rob/Lucas I guess we could push these also through > drm-misc. Patch itself looks fine. I prefer to route the etnaviv change through my tree, to give it the usual exposure to our testing. Regards, Lucas > > > --- > > > > Note: compile-tested only. > > > > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + > > drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + > > drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 +++++++ > > 3 files changed, 9 insertions(+) > > > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > > index 587e45043542..ff6db8f0d966 100644 > > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > > @@ -495,6 +495,7 @@ static struct drm_driver etnaviv_drm_driver = { > > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > > .gem_prime_export = drm_gem_prime_export, > > .gem_prime_import = drm_gem_prime_import, > > + .gem_prime_res_obj = etnaviv_gem_prime_res_obj, > > .gem_prime_pin = etnaviv_gem_prime_pin, > > .gem_prime_unpin = etnaviv_gem_prime_unpin, > > .gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table, > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > > index e41f38667c1c..058389f93b69 100644 > > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > > @@ -80,6 +80,7 @@ void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); > > void etnaviv_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); > > int etnaviv_gem_prime_mmap(struct drm_gem_object *obj, > > struct vm_area_struct *vma); > > +struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj); > > struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev, > > struct dma_buf_attachment *attach, struct sg_table *sg); > > int etnaviv_gem_prime_pin(struct drm_gem_object *obj); > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c > > index 62b47972a52e..abed6f781281 100644 > > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c > > @@ -150,3 +150,10 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev, > > > > return ERR_PTR(ret); > > } > > + > > +struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj) > > +{ > > + struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj); > > + > > + return etnaviv_obj->resv; > > +} > > -- > > 2.11.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel >