lkml.org 
[lkml]   [2018]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/4] drm/v3d: Clean up the reservation object setup.
On Thu,  8 Nov 2018 08:16:53 -0800
Eric Anholt <eric@anholt.net> wrote:

> The extra to_v3d_bo() calls came from copying this from the vc4
> driver, which stored the cma gem object in the structs.
>
> Signed-off-by: Eric Anholt <eric@anholt.net>

Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>

> ---
> drivers/gpu/drm/v3d/v3d_gem.c | 32 +++++++++++---------------------
> 1 file changed, 11 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
> index b88c96911453..d0dfdcbbd42c 100644
> --- a/drivers/gpu/drm/v3d/v3d_gem.c
> +++ b/drivers/gpu/drm/v3d/v3d_gem.c
> @@ -214,10 +214,8 @@ v3d_attach_object_fences(struct v3d_exec_info *exec)
> int i;
>
> for (i = 0; i < exec->bo_count; i++) {
> - bo = to_v3d_bo(&exec->bo[i]->base);
> -
> /* XXX: Use shared fences for read-only objects. */
> - reservation_object_add_excl_fence(bo->resv, out_fence);
> + reservation_object_add_excl_fence(exec->bo[i]->resv, out_fence);
> }
> }
>
> @@ -228,11 +226,8 @@ v3d_unlock_bo_reservations(struct drm_device *dev,
> {
> int i;
>
> - for (i = 0; i < exec->bo_count; i++) {
> - struct v3d_bo *bo = to_v3d_bo(&exec->bo[i]->base);
> -
> - ww_mutex_unlock(&bo->resv->lock);
> - }
> + for (i = 0; i < exec->bo_count; i++)
> + ww_mutex_unlock(&exec->bo[i]->resv->lock);
>
> ww_acquire_fini(acquire_ctx);
> }
> @@ -251,13 +246,13 @@ v3d_lock_bo_reservations(struct drm_device *dev,
> {
> int contended_lock = -1;
> int i, ret;
> - struct v3d_bo *bo;
>
> ww_acquire_init(acquire_ctx, &reservation_ww_class);
>
> retry:
> if (contended_lock != -1) {
> - bo = to_v3d_bo(&exec->bo[contended_lock]->base);
> + struct v3d_bo *bo = exec->bo[contended_lock];
> +
> ret = ww_mutex_lock_slow_interruptible(&bo->resv->lock,
> acquire_ctx);
> if (ret) {
> @@ -270,19 +265,16 @@ v3d_lock_bo_reservations(struct drm_device *dev,
> if (i == contended_lock)
> continue;
>
> - bo = to_v3d_bo(&exec->bo[i]->base);
> -
> - ret = ww_mutex_lock_interruptible(&bo->resv->lock, acquire_ctx);
> + ret = ww_mutex_lock_interruptible(&exec->bo[i]->resv->lock,
> + acquire_ctx);
> if (ret) {
> int j;
>
> - for (j = 0; j < i; j++) {
> - bo = to_v3d_bo(&exec->bo[j]->base);
> - ww_mutex_unlock(&bo->resv->lock);
> - }
> + for (j = 0; j < i; j++)
> + ww_mutex_unlock(&exec->bo[j]->resv->lock);
>
> if (contended_lock != -1 && contended_lock >= i) {
> - bo = to_v3d_bo(&exec->bo[contended_lock]->base);
> + struct v3d_bo *bo = exec->bo[contended_lock];
>
> ww_mutex_unlock(&bo->resv->lock);
> }
> @@ -303,9 +295,7 @@ v3d_lock_bo_reservations(struct drm_device *dev,
> * before we commit the CL to the hardware.
> */
> for (i = 0; i < exec->bo_count; i++) {
> - bo = to_v3d_bo(&exec->bo[i]->base);
> -
> - ret = reservation_object_reserve_shared(bo->resv, 1);
> + ret = reservation_object_reserve_shared(exec->bo[i]->resv, 1);
> if (ret) {
> v3d_unlock_bo_reservations(dev, exec, acquire_ctx);
> return ret;

\
 
 \ /
  Last update: 2018-11-13 11:23    [W:0.120 / U:7.432 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site