[PATCH 07/10] drm/amd/display: use ttm_eu_reserve_buffers instead of amdgpu_bo_reserve v2

[Alex Deucher]

On Tue, May 28, 2019 at 1:05 PM Sam Ravnborg <sam at ravnborg.org> wrote:
>
> Hi Christian.
>
> On Tue, May 28, 2019 at 06:25:54PM +0200, Christian König wrote:
> > From: Chunming Zhou <david1.zhou at amd.com>
> >
> > add ticket for display bo, so that it can preempt busy bo.
> >
> > v2: fix stupid rebase error
> >
> > Change-Id: I9f031cdcc8267de00e819ae303baa0a52df8ebb9
> What is this?
> I do not recall seeing this in a changelog before?

It's an artifact of gerrit which we use internally for git management.

Alex

>
> (Sorry for not commenting on the patch, most of it is beyond my
> understanding for now).
>
>         Sam
>
> > Signed-off-by: Chunming Zhou <david1.zhou at amd.com>
> > Reviewed-by: Christian König <christian.koenig at amd.com>
> > ---
> >  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 21 ++++++++++++++-----
> >  1 file changed, 16 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > index 4a1755bce96c..56f320f3fd72 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > @@ -4182,6 +4182,9 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> >       struct amdgpu_device *adev;
> >       struct amdgpu_bo *rbo;
> >       struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;
> > +     struct list_head list;
> > +     struct ttm_validate_buffer tv;
> > +     struct ww_acquire_ctx ticket;
> >       uint64_t tiling_flags;
> >       uint32_t domain;
> >       int r;
> > @@ -4198,9 +4201,17 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> >       obj = new_state->fb->obj[0];
> >       rbo = gem_to_amdgpu_bo(obj);
> >       adev = amdgpu_ttm_adev(rbo->tbo.bdev);
> > -     r = amdgpu_bo_reserve(rbo, false);
> > -     if (unlikely(r != 0))
> > +     INIT_LIST_HEAD(&list);
> > +
> > +     tv.bo = &rbo->tbo;
> > +     tv.num_shared = 1;
> > +     list_add(&tv.head, &list);
> > +
> > +     r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL, true);
> > +     if (r) {
> > +             dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
> >               return r;
> > +     }
> >
> >       if (plane->type != DRM_PLANE_TYPE_CURSOR)
> >               domain = amdgpu_display_supported_domains(adev);
> > @@ -4211,21 +4222,21 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> >       if (unlikely(r != 0)) {
> >               if (r != -ERESTARTSYS)
> >                       DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
> > -             amdgpu_bo_unreserve(rbo);
> > +             ttm_eu_backoff_reservation(&ticket, &list);
> >               return r;
> >       }
> >
> >       r = amdgpu_ttm_alloc_gart(&rbo->tbo);
> >       if (unlikely(r != 0)) {
> >               amdgpu_bo_unpin(rbo);
> > -             amdgpu_bo_unreserve(rbo);
> > +             ttm_eu_backoff_reservation(&ticket, &list);
> >               DRM_ERROR("%p bind failed\n", rbo);
> >               return r;
> >       }
> >
> >       amdgpu_bo_get_tiling_flags(rbo, &tiling_flags);
> >
> > -     amdgpu_bo_unreserve(rbo);
> > +     ttm_eu_backoff_reservation(&ticket, &list);
> >
> >       afb->address = amdgpu_bo_gpu_offset(rbo);
> >
> > --
> > 2.17.1
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel