[PATCH 2/6] drm: Rename DRM_MINOR_LEGACY to DRM_MINOR_PRIMARY

[Daniel Vetter]

On Fri, Jun 24, 2016 at 06:15:16PM +0100, Frank Binns wrote:
> This brings the minor type name into line with how the actual minor,
> using this type, is referenced throughout the rest of drm.
> 
> Signed-off-by: Frank Binns <frank.binns at imgtec.com>

Tiny conflict with latest drm-misc, please rebase (since I'm still halfway
in vacation mode, so don't trust myself to do it ...).

Thanks, Daniel

> ---
>  drivers/gpu/drm/drm_drv.c | 16 ++++++++--------
>  include/drm/drmP.h        |  4 ++--
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index aead9ff..7775c8b 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -112,7 +112,7 @@ static struct drm_minor **drm_minor_get_slot(struct drm_device *dev,
>  					     unsigned int type)
>  {
>  	switch (type) {
> -	case DRM_MINOR_LEGACY:
> +	case DRM_MINOR_PRIMARY:
>  		return &dev->primary;
>  	case DRM_MINOR_RENDER:
>  		return &dev->render;
> @@ -362,7 +362,7 @@ EXPORT_SYMBOL(drm_put_dev);
>  void drm_unplug_dev(struct drm_device *dev)
>  {
>  	/* for a USB device */
> -	drm_minor_unregister(dev, DRM_MINOR_LEGACY);
> +	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
>  	drm_minor_unregister(dev, DRM_MINOR_RENDER);
>  	drm_minor_unregister(dev, DRM_MINOR_CONTROL);
>  
> @@ -514,7 +514,7 @@ int drm_dev_init(struct drm_device *dev,
>  			goto err_minors;
>  	}
>  
> -	ret = drm_minor_alloc(dev, DRM_MINOR_LEGACY);
> +	ret = drm_minor_alloc(dev, DRM_MINOR_PRIMARY);
>  	if (ret)
>  		goto err_minors;
>  
> @@ -547,7 +547,7 @@ err_ctxbitmap:
>  	drm_legacy_ctxbitmap_cleanup(dev);
>  	drm_ht_remove(&dev->map_hash);
>  err_minors:
> -	drm_minor_free(dev, DRM_MINOR_LEGACY);
> +	drm_minor_free(dev, DRM_MINOR_PRIMARY);
>  	drm_minor_free(dev, DRM_MINOR_RENDER);
>  	drm_minor_free(dev, DRM_MINOR_CONTROL);
>  	drm_fs_inode_free(dev->anon_inode);
> @@ -610,7 +610,7 @@ static void drm_dev_release(struct kref *ref)
>  	drm_ht_remove(&dev->map_hash);
>  	drm_fs_inode_free(dev->anon_inode);
>  
> -	drm_minor_free(dev, DRM_MINOR_LEGACY);
> +	drm_minor_free(dev, DRM_MINOR_PRIMARY);
>  	drm_minor_free(dev, DRM_MINOR_RENDER);
>  	drm_minor_free(dev, DRM_MINOR_CONTROL);
>  
> @@ -686,7 +686,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
>  	if (ret)
>  		goto err_minors;
>  
> -	ret = drm_minor_register(dev, DRM_MINOR_LEGACY);
> +	ret = drm_minor_register(dev, DRM_MINOR_PRIMARY);
>  	if (ret)
>  		goto err_minors;
>  
> @@ -703,7 +703,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
>  	goto out_unlock;
>  
>  err_minors:
> -	drm_minor_unregister(dev, DRM_MINOR_LEGACY);
> +	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
>  	drm_minor_unregister(dev, DRM_MINOR_RENDER);
>  	drm_minor_unregister(dev, DRM_MINOR_CONTROL);
>  out_unlock:
> @@ -743,7 +743,7 @@ void drm_dev_unregister(struct drm_device *dev)
>  	list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
>  		drm_legacy_rmmap(dev, r_list->map);
>  
> -	drm_minor_unregister(dev, DRM_MINOR_LEGACY);
> +	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
>  	drm_minor_unregister(dev, DRM_MINOR_RENDER);
>  	drm_minor_unregister(dev, DRM_MINOR_CONTROL);
>  }
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index cf918e3e..1d39988 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -642,7 +642,7 @@ struct drm_driver {
>  };
>  
>  enum drm_minor_type {
> -	DRM_MINOR_LEGACY,
> +	DRM_MINOR_PRIMARY,
>  	DRM_MINOR_CONTROL,
>  	DRM_MINOR_RENDER,
>  	DRM_MINOR_CNT,
> @@ -883,7 +883,7 @@ static inline bool drm_is_control_client(const struct drm_file *file_priv)
>  
>  static inline bool drm_is_primary_client(const struct drm_file *file_priv)
>  {
> -	return file_priv->minor->type == DRM_MINOR_LEGACY;
> +	return file_priv->minor->type == DRM_MINOR_PRIMARY;
>  }
>  
>  /******************************************************************/
> -- 
> 2.7.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

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