[Intel-gfx] [PATCH 4/6] drm/ttm: Force re-init if ttm_global_init() fails

Daniel Vetter daniel at ffwll.ch
Wed Jul 21 09:06:12 UTC 2021


On Wed, Jul 21, 2021 at 8:36 AM Christian König
<christian.koenig at amd.com> wrote:
> Am 20.07.21 um 20:13 schrieb Jason Ekstrand:
> > If we have a failure, decrement the reference count so that the next
> > call to ttm_global_init() will actually do something instead of assume
> > everything is all set up.
> >
> > Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> > Fixes: 62b53b37e4b1 ("drm/ttm: use a static ttm_bo_global instance")
> > Reviewed-by: Christian König <christian.koenig at amd.com>
>
> I've just pushed this to drm-misc-fixes.

Did you see patch 5/6 here which is also touching ttm?
-Daniel

>
> Thanks,
> Christian.
>
> > ---
> >   drivers/gpu/drm/ttm/ttm_device.c | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
> > index 5f31acec3ad76..519deea8e39b7 100644
> > --- a/drivers/gpu/drm/ttm/ttm_device.c
> > +++ b/drivers/gpu/drm/ttm/ttm_device.c
> > @@ -100,6 +100,8 @@ static int ttm_global_init(void)
> >       debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root,
> >                               &glob->bo_count);
> >   out:
> > +     if (ret)
> > +             --ttm_glob_use_count;
> >       mutex_unlock(&ttm_global_mutex);
> >       return ret;
> >   }
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list