[PATCH] drm: Give irq_by_busid drm_legacy_ prefix

Alex Deucher alexdeucher at gmail.com
Thu Oct 8 14:38:05 UTC 2020


On Thu, Oct 8, 2020 at 10:29 AM Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
>
> It's the only ioctl handler purely for legacy drivers that didn't have
> this yet.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

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

> ---
>  drivers/gpu/drm/drm_internal.h | 8 ++++----
>  drivers/gpu/drm/drm_ioctl.c    | 2 +-
>  drivers/gpu/drm/drm_pci.c      | 6 +++---
>  3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
> index b65865c630b0..2bdac3557765 100644
> --- a/drivers/gpu/drm/drm_internal.h
> +++ b/drivers/gpu/drm/drm_internal.h
> @@ -53,15 +53,15 @@ void drm_lastclose(struct drm_device *dev);
>  #ifdef CONFIG_PCI
>
>  /* drm_pci.c */
> -int drm_irq_by_busid(struct drm_device *dev, void *data,
> -                    struct drm_file *file_priv);
> +int drm_legacy_irq_by_busid(struct drm_device *dev, void *data,
> +                           struct drm_file *file_priv);
>  void drm_pci_agp_destroy(struct drm_device *dev);
>  int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master);
>
>  #else
>
> -static inline int drm_irq_by_busid(struct drm_device *dev, void *data,
> -                                  struct drm_file *file_priv)
> +static inline int drm_legacy_irq_by_busid(struct drm_device *dev, void *data,
> +                                         struct drm_file *file_priv)
>  {
>         return -EINVAL;
>  }
> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> index 87a44492957e..6def1621e32a 100644
> --- a/drivers/gpu/drm/drm_ioctl.c
> +++ b/drivers/gpu/drm/drm_ioctl.c
> @@ -578,7 +578,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
>         DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_RENDER_ALLOW),
>         DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
>         DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
> -       DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
> +       DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_legacy_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
>
>         DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_legacy_getmap_ioctl, 0),
>
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index c250fb5a88ca..6dba4b8ce4fe 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -139,7 +139,7 @@ static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
>  }
>
>  /**
> - * drm_irq_by_busid - Get interrupt from bus ID
> + * drm_legacy_irq_by_busid - Get interrupt from bus ID
>   * @dev: DRM device
>   * @data: IOCTL parameter pointing to a drm_irq_busid structure
>   * @file_priv: DRM file private.
> @@ -150,8 +150,8 @@ static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
>   *
>   * Return: 0 on success or a negative error code on failure.
>   */
> -int drm_irq_by_busid(struct drm_device *dev, void *data,
> -                    struct drm_file *file_priv)
> +int drm_legacy_irq_by_busid(struct drm_device *dev, void *data,
> +                           struct drm_file *file_priv)
>  {
>         struct drm_irq_busid *p = data;
>
> --
> 2.28.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel


More information about the dri-devel mailing list