[Intel-gfx] [PATCH 12/15] drm/moc: Mark legacy fields in drm_driver as such

[Alex Deucher]

On Wed, Jan 25, 2017 at 1:26 AM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> No point in documenting these, they only confuse.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |  1 -
>  include/drm/drm_drv.h                   | 13 ++++++++-----
>  2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 2534adaebe30..38c22c3c0d54 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -686,7 +686,6 @@ static struct drm_driver kms_driver = {
>             DRIVER_USE_AGP |
>             DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
>             DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
> -       .dev_priv_size = 0,
>         .load = amdgpu_driver_load_kms,
>         .open = amdgpu_driver_open_kms,
>         .preclose = amdgpu_driver_preclose_kms,
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 8391135b95f2..732e85652d1e 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -81,7 +81,6 @@ struct drm_driver {
>          * Zero on success, non-zero value on failure.
>          */
>         int (*load) (struct drm_device *, unsigned long flags);
> -       int (*firstopen) (struct drm_device *);
>         int (*open) (struct drm_device *, struct drm_file *);
>         void (*preclose) (struct drm_device *, struct drm_file *file_priv);
>         void (*postclose) (struct drm_device *, struct drm_file *);
> @@ -103,9 +102,6 @@ struct drm_driver {
>          *
>          */
>         void (*unload) (struct drm_device *);
> -       int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
> -       int (*dma_quiescent) (struct drm_device *);
> -       int (*context_dtor) (struct drm_device *dev, int context);
>         int (*set_busid)(struct drm_device *dev, struct drm_master *master);
>
>         /**
> @@ -413,13 +409,20 @@ struct drm_driver {
>         char *date;
>
>         u32 driver_features;
> -       int dev_priv_size;
>         const struct drm_ioctl_desc *ioctls;
>         int num_ioctls;
>         const struct file_operations *fops;
>
> +       /* Everything below here is for legacy driver, never use! */
> +       /* private: */
> +
>         /* List of devices hanging off this driver with stealth attach. */
>         struct list_head legacy_dev_list;
> +       int (*firstopen) (struct drm_device *);
> +       int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
> +       int (*dma_quiescent) (struct drm_device *);
> +       int (*context_dtor) (struct drm_device *dev, int context);
> +       int dev_priv_size;
>  };
>
>  extern __printf(6, 7)
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel