| Message ID | 20170411014414.20280-2-eric@anholt.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <eric@anholt.net> > Cc: stable@vger.kernel.org > Cc: Lucas Stach <l.stach@pengutronix.de> > Cc: Russell King <linux+etnaviv@armlinux.org.uk> > Cc: Christian Gmeiner <christian.gmeiner@gmail.com> > Cc: etnaviv@lists.freedesktop.org On the first 2 patches: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> If you get an ack from Rob/Lucas I guess we could push these also through drm-misc. -Daniel > --- > > 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
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 <eric@anholt.net> > > Cc: stable@vger.kernel.org > > Cc: Lucas Stach <l.stach@pengutronix.de> > > Cc: Russell King <linux+etnaviv@armlinux.org.uk> > > Cc: Christian Gmeiner <christian.gmeiner@gmail.com> > > Cc: etnaviv@lists.freedesktop.org > > On the first 2 patches: > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > 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 >
Lucas Stach <l.stach@pengutronix.de> writes: > 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 <eric@anholt.net> >> > Cc: stable@vger.kernel.org >> > Cc: Lucas Stach <l.stach@pengutronix.de> >> > Cc: Russell King <linux+etnaviv@armlinux.org.uk> >> > Cc: Christian Gmeiner <christian.gmeiner@gmail.com> >> > Cc: etnaviv@lists.freedesktop.org >> >> On the first 2 patches: >> >> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> >> >> 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. Yeah, I'd rather you grab it so you can test it before it lands.
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; +}
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 <eric@anholt.net> Cc: stable@vger.kernel.org Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Russell King <linux+etnaviv@armlinux.org.uk> Cc: Christian Gmeiner <christian.gmeiner@gmail.com> Cc: etnaviv@lists.freedesktop.org --- 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(+)