Emil Velikov
2019-May-22 15:02 UTC
[Nouveau] [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
From: Emil Velikov <emil.velikov at collabora.com>
Cc: Ben Skeggs <bskeggs at redhat.com>
Cc: nouveau at lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
drivers/gpu/drm/nouveau/nouveau_abi16.c | 6 ------
drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 -
drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c
b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index c3fd5dd39ed9..0c585dc5f5c3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -244,12 +244,6 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
return 0;
}
-int
-nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS)
-{
- return -EINVAL;
-}
-
int
nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
{
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h
b/drivers/gpu/drm/nouveau/nouveau_abi16.h
index 36fde1ff3ad5..9275d529b947 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.h
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h
@@ -6,7 +6,6 @@
struct drm_device *dev, void *data, struct drm_file *file_priv
int nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS);
-int nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS);
int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS);
int nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS);
int nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c
b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 22cd45845e07..ed45ad2b72f2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -1046,7 +1046,7 @@ nouveau_drm_postclose(struct drm_device *dev, struct
drm_file *fpriv)
static const struct drm_ioctl_desc
nouveau_ioctls[] = {
DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam,
DRM_AUTH|DRM_RENDER_ALLOW),
- DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam,
DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+ DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, drm_invalid_op,
DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc,
DRM_AUTH|DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free,
DRM_AUTH|DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc,
DRM_AUTH|DRM_RENDER_ALLOW),
--
2.21.0
Ben Skeggs
2019-May-23 00:19 UTC
[Nouveau] [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
On Thu, 23 May 2019 at 01:03, Emil Velikov <emil.l.velikov at gmail.com> wrote:> > From: Emil Velikov <emil.velikov at collabora.com> > > Cc: Ben Skeggs <bskeggs at redhat.com> > Cc: nouveau at lists.freedesktop.org > Signed-off-by: Emil Velikov <emil.velikov at collabora.com>Thanks!> --- > drivers/gpu/drm/nouveau/nouveau_abi16.c | 6 ------ > drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 - > drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- > 3 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c > index c3fd5dd39ed9..0c585dc5f5c3 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c > +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c > @@ -244,12 +244,6 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) > return 0; > } > > -int > -nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS) > -{ > - return -EINVAL; > -} > - > int > nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) > { > diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h b/drivers/gpu/drm/nouveau/nouveau_abi16.h > index 36fde1ff3ad5..9275d529b947 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_abi16.h > +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h > @@ -6,7 +6,6 @@ > struct drm_device *dev, void *data, struct drm_file *file_priv > > int nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS); > -int nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS); > int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS); > int nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS); > int nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS); > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > index 22cd45845e07..ed45ad2b72f2 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -1046,7 +1046,7 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv) > static const struct drm_ioctl_desc > nouveau_ioctls[] = { > DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_AUTH|DRM_RENDER_ALLOW), > - DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), > + DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), > DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc, DRM_AUTH|DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free, DRM_AUTH|DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc, DRM_AUTH|DRM_RENDER_ALLOW), > -- > 2.21.0 > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Emil Velikov
2019-May-24 15:14 UTC
[Nouveau] [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
On 2019/05/23, Ben Skeggs wrote:> On Thu, 23 May 2019 at 01:03, Emil Velikov <emil.l.velikov at gmail.com> wrote: > > > > From: Emil Velikov <emil.velikov at collabora.com> > > > > Cc: Ben Skeggs <bskeggs at redhat.com> > > Cc: nouveau at lists.freedesktop.org > > Signed-off-by: Emil Velikov <emil.velikov at collabora.com> > Thanks! >Forgot to mention, any objections if I take this through drm-misc? I'm about to send a lengthy series which will conflict with this patch, albeit trivially. Thanks Emil
Emil Velikov
2019-Aug-06 09:42 UTC
[Nouveau] [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
Hi Ben, On Thu, 23 May 2019 at 01:19, Ben Skeggs <skeggsb at gmail.com> wrote:> > On Thu, 23 May 2019 at 01:03, Emil Velikov <emil.l.velikov at gmail.com> wrote: > > > > From: Emil Velikov <emil.velikov at collabora.com> > > > > Cc: Ben Skeggs <bskeggs at redhat.com> > > Cc: nouveau at lists.freedesktop.org > > Signed-off-by: Emil Velikov <emil.velikov at collabora.com> > Thanks! >Sadly Dave reverted this, since the thanks wasn't spelled out as Acked-by/R-b/other. Can you be more explicit, or alternatively feel free to pick the patch through your tree. Thanks Emil
Apparently Analagous Threads
- [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
- [PATCH 08/13] drm/nouveau: drop DRM_AUTH from DRM_RENDER_ALLOW ioctls
- [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
- [PATCH 3/5] drm/nouveau: utilize subconnector property for DP
- [PATCH v3 5/7] drm/nouveau: utilize subconnector property for DP