[PATCH 1/4] drm/radeon: move ring syncing after bo validation

[Jerome Glisse]

On Thu, 2012-02-23 at 10:17 -0500, Alex Deucher wrote:
> 2012/2/23 Christian König <deathsimple at vodafone.de>:
> > The function radeon_bo_list_validate can cause a
> > bo to move, resulting in a different sync_obj
> > and a dependency to wait for this move to finish.
> >
> > Signed-off-by: Christian König <deathsimple at vodafone.de>
> > Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> 
> For the series:
> 
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

Same
Reviewed-by: Jerome Glisse <jglisse at redhat.com>

> 
> > ---
> >  drivers/gpu/drm/radeon/radeon.h    |    1 -
> >  drivers/gpu/drm/radeon/radeon_cs.c |   21 ++++++++++++++-------
> >  2 files changed, 14 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> > index 884e0d4..4c1b981 100644
> > --- a/drivers/gpu/drm/radeon/radeon.h
> > +++ b/drivers/gpu/drm/radeon/radeon.h
> > @@ -836,7 +836,6 @@ struct radeon_cs_parser {
> >        struct radeon_cs_reloc  *relocs;
> >        struct radeon_cs_reloc  **relocs_ptr;
> >        struct list_head        validated;
> > -       bool                    sync_to_ring[RADEON_NUM_RINGS];
> >        /* indices of various chunks */
> >        int                     chunk_ib_idx;
> >        int                     chunk_relocs_idx;
> > diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
> > index 435a3d9..7fd0987 100644
> > --- a/drivers/gpu/drm/radeon/radeon_cs.c
> > +++ b/drivers/gpu/drm/radeon/radeon_cs.c
> > @@ -85,12 +85,6 @@ int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
> >                        radeon_bo_list_add_object(&p->relocs[i].lobj,
> >                                                  &p->validated);
> >
> > -                       if (p->relocs[i].robj->tbo.sync_obj && !(r->flags & RADEON_RELOC_DONT_SYNC)) {
> > -                               struct radeon_fence *fence = p->relocs[i].robj->tbo.sync_obj;
> > -                               if (!radeon_fence_signaled(fence)) {
> > -                                       p->sync_to_ring[fence->ring] = true;
> > -                               }
> > -                       }
> >                } else
> >                        p->relocs[i].handle = 0;
> >        }
> > @@ -118,11 +112,24 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
> >
> >  static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
> >  {
> > +       bool sync_to_ring[RADEON_NUM_RINGS] = { };
> >        int i, r;
> >
> > +       for (i = 0; i < p->nrelocs; i++) {
> > +               if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj)
> > +                       continue;
> > +
> > +               if (!(p->relocs[i].flags & RADEON_RELOC_DONT_SYNC)) {
> > +                       struct radeon_fence *fence = p->relocs[i].robj->tbo.sync_obj;
> > +                       if (!radeon_fence_signaled(fence)) {
> > +                               sync_to_ring[fence->ring] = true;
> > +                       }
> > +               }
> > +       }
> > +
> >        for (i = 0; i < RADEON_NUM_RINGS; ++i) {
> >                /* no need to sync to our own or unused rings */
> > -               if (i == p->ring || !p->sync_to_ring[i] || !p->rdev->ring[i].ready)
> > +               if (i == p->ring || !sync_to_ring[i] || !p->rdev->ring[i].ready)
> >                        continue;
> >
> >                if (!p->ib->fence->semaphore) {
> > --
> > 1.7.5.4
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel