On Tue, Apr 23, 2019 at 08:45:11PM +0200, Daniel Vetter wrote:
> On Tue, Apr 23, 2019 at 12:00:35PM +1000, Dave Airlie wrote:
> > From: Dave Airlie <airlied@xxxxxxxxxx>
> >
> > This allows them to be removed later.
> >
> > Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
>
> vmwgfx still uses these? Is the plan to burn that down :-)
>
> Probably easier to add a todo.rst item to clean that up than do it
> yourself.
With the insight of later patches telling me what you plan to do:
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> -Daniel
>
> > ---
> > drivers/gpu/drm/drm_drv.c | 7 +++----
> > drivers/gpu/drm/drm_legacy.h | 10 ++++++++++
> > 2 files changed, 13 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> > index 15b0fd5adaaf..18f45f9a955c 100644
> > --- a/drivers/gpu/drm/drm_drv.c
> > +++ b/drivers/gpu/drm/drm_drv.c
> > @@ -692,10 +692,9 @@ int drm_dev_init(struct drm_device *dev,
> > if (ret)
> > goto err_minors;
> >
> > - ret = drm_ht_create(&dev->map_hash, 12);
> > + ret = drm_legacy_create_map_hash(dev);
> > if (ret)
> > goto err_minors;
> > -
> > drm_legacy_ctxbitmap_init(dev);
> >
> > if (drm_core_check_feature(dev, DRIVER_GEM)) {
> > @@ -717,7 +716,7 @@ int drm_dev_init(struct drm_device *dev,
> > drm_gem_destroy(dev);
> > err_ctxbitmap:
> > drm_legacy_ctxbitmap_cleanup(dev);
> > - drm_ht_remove(&dev->map_hash);
> > + drm_legacy_remove_map_hash(dev);
> > err_minors:
> > drm_minor_free(dev, DRM_MINOR_PRIMARY);
> > drm_minor_free(dev, DRM_MINOR_RENDER);
> > @@ -792,7 +791,7 @@ void drm_dev_fini(struct drm_device *dev)
> > drm_gem_destroy(dev);
> >
> > drm_legacy_ctxbitmap_cleanup(dev);
> > - drm_ht_remove(&dev->map_hash);
> > + drm_legacy_remove_map_hash(dev);
> > drm_fs_inode_free(dev->anon_inode);
> >
> > drm_minor_free(dev, DRM_MINOR_PRIMARY);
> > diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
> > index 974c2be6bcd5..ef419d500e51 100644
> > --- a/drivers/gpu/drm/drm_legacy.h
> > +++ b/drivers/gpu/drm/drm_legacy.h
> > @@ -63,6 +63,16 @@ int drm_legacy_getsareactx(struct drm_device *d, void *v, struct drm_file *f);
> >
> > #define DRM_MAP_HASH_OFFSET 0x10000000
> >
> > +static inline int drm_legacy_create_map_hash(struct drm_device *dev)
> > +{
> > + return drm_ht_create(&dev->map_hash, 12);
> > +}
> > +
> > +static inline void drm_legacy_remove_map_hash(struct drm_device *dev)
> > +{
> > + drm_ht_remove(&dev->map_hash);
> > +}
> > +
> > int drm_legacy_getmap_ioctl(struct drm_device *dev, void *data,
> > struct drm_file *file_priv);
> > int drm_legacy_addmap_ioctl(struct drm_device *d, void *v, struct drm_file *f);
> > --
> > 2.20.1
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
