* [PATCH] drm: Give irq_by_busid drm_legacy_ prefix
@ 2020-10-08 14:29 Daniel Vetter
2020-10-08 14:38 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2020-10-08 14:29 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
It's the only ioctl handler purely for legacy drivers that didn't have
this yet.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: Give irq_by_busid drm_legacy_ prefix
2020-10-08 14:29 [PATCH] drm: Give irq_by_busid drm_legacy_ prefix Daniel Vetter
@ 2020-10-08 14:38 ` Alex Deucher
2020-10-21 16:05 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Alex Deucher @ 2020-10-08 14:38 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Thu, Oct 8, 2020 at 10:29 AM Daniel Vetter <daniel.vetter@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@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: Give irq_by_busid drm_legacy_ prefix
2020-10-08 14:38 ` Alex Deucher
@ 2020-10-21 16:05 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2020-10-21 16:05 UTC (permalink / raw)
To: Alex Deucher; +Cc: Daniel Vetter, DRI Development, Daniel Vetter
On Thu, Oct 08, 2020 at 10:38:05AM -0400, Alex Deucher wrote:
> On Thu, Oct 8, 2020 at 10:29 AM Daniel Vetter <daniel.vetter@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@intel.com>
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Thanks for reviewing, patch applied.
-Daniel
>
> > ---
> > 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@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-21 16:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-08 14:29 [PATCH] drm: Give irq_by_busid drm_legacy_ prefix Daniel Vetter
2020-10-08 14:38 ` Alex Deucher
2020-10-21 16:05 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.