* [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op()
@ 2019-05-22 15:02 Emil Velikov
2019-05-22 15:02 ` [PATCH 2/2] drm/nouveau: " Emil Velikov
2019-05-28 10:54 ` [PATCH 1/2] drm/omap: " Tomi Valkeinen
0 siblings, 2 replies; 9+ messages in thread
From: Emil Velikov @ 2019-05-22 15:02 UTC (permalink / raw)
To: dri-devel; +Cc: Tomi Valkeinen, emil.l.velikov
From: Emil Velikov <emil.velikov@collabora.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/omapdrm/omap_drv.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 1b9b6f5e48e1..672e0f8ad11c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -439,20 +439,6 @@ static int ioctl_get_param(struct drm_device *dev, void *data,
return 0;
}
-static int ioctl_set_param(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
-{
- struct drm_omap_param *args = data;
-
- switch (args->param) {
- default:
- DBG("unknown parameter %lld", args->param);
- return -EINVAL;
- }
-
- return 0;
-}
-
#define OMAP_BO_USER_MASK 0x00ffffff /* flags settable by userspace */
static int ioctl_gem_new(struct drm_device *dev, void *data,
@@ -492,7 +478,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param,
DRM_AUTH | DRM_RENDER_ALLOW),
- DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param,
+ DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, drm_invalid_op,
DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY),
DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new,
DRM_AUTH | DRM_RENDER_ALLOW),
--
2.21.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/2] drm/nouveau: remove open-coded drm_invalid_op()
2019-05-22 15:02 [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op() Emil Velikov
@ 2019-05-22 15:02 ` Emil Velikov
[not found] ` <20190522150219.13913-2-emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-05-28 10:54 ` [PATCH 1/2] drm/omap: " Tomi Valkeinen
1 sibling, 1 reply; 9+ messages in thread
From: Emil Velikov @ 2019-05-22 15:02 UTC (permalink / raw)
To: dri-devel; +Cc: nouveau, emil.l.velikov, Ben Skeggs
From: Emil Velikov <emil.velikov@collabora.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: nouveau@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov@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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op()
2019-05-22 15:02 [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op() Emil Velikov
2019-05-22 15:02 ` [PATCH 2/2] drm/nouveau: " Emil Velikov
@ 2019-05-28 10:54 ` Tomi Valkeinen
2019-05-28 15:41 ` Emil Velikov
1 sibling, 1 reply; 9+ messages in thread
From: Tomi Valkeinen @ 2019-05-28 10:54 UTC (permalink / raw)
To: Emil Velikov, dri-devel
On 22/05/2019 18:02, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov@collabora.com>
>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
> ---
> drivers/gpu/drm/omapdrm/omap_drv.c | 16 +---------------
> 1 file changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index 1b9b6f5e48e1..672e0f8ad11c 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -439,20 +439,6 @@ static int ioctl_get_param(struct drm_device *dev, void *data,
> return 0;
> }
>
> -static int ioctl_set_param(struct drm_device *dev, void *data,
> - struct drm_file *file_priv)
> -{
> - struct drm_omap_param *args = data;
> -
> - switch (args->param) {
> - default:
> - DBG("unknown parameter %lld", args->param);
> - return -EINVAL;
> - }
> -
> - return 0;
> -}
> -
> #define OMAP_BO_USER_MASK 0x00ffffff /* flags settable by userspace */
>
> static int ioctl_gem_new(struct drm_device *dev, void *data,
> @@ -492,7 +478,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
> static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
> DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param,
> DRM_AUTH | DRM_RENDER_ALLOW),
> - DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param,
> + DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, drm_invalid_op,
> DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new,
> DRM_AUTH | DRM_RENDER_ALLOW),
>
Thanks! Do you want to take this via drm-misc too, or can I pick it up?
Tomi
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op()
2019-05-28 10:54 ` [PATCH 1/2] drm/omap: " Tomi Valkeinen
@ 2019-05-28 15:41 ` Emil Velikov
2019-05-28 16:49 ` Tomi Valkeinen
0 siblings, 1 reply; 9+ messages in thread
From: Emil Velikov @ 2019-05-28 15:41 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: dri-devel
On 2019/05/28, Tomi Valkeinen wrote:
> On 22/05/2019 18:02, Emil Velikov wrote:
> > From: Emil Velikov <emil.velikov@collabora.com>
> >
> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
> > ---
> > drivers/gpu/drm/omapdrm/omap_drv.c | 16 +---------------
> > 1 file changed, 1 insertion(+), 15 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> > index 1b9b6f5e48e1..672e0f8ad11c 100644
> > --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> > @@ -439,20 +439,6 @@ static int ioctl_get_param(struct drm_device *dev, void *data,
> > return 0;
> > }
> > -static int ioctl_set_param(struct drm_device *dev, void *data,
> > - struct drm_file *file_priv)
> > -{
> > - struct drm_omap_param *args = data;
> > -
> > - switch (args->param) {
> > - default:
> > - DBG("unknown parameter %lld", args->param);
> > - return -EINVAL;
> > - }
> > -
> > - return 0;
> > -}
> > -
> > #define OMAP_BO_USER_MASK 0x00ffffff /* flags settable by userspace */
> > static int ioctl_gem_new(struct drm_device *dev, void *data,
> > @@ -492,7 +478,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
> > static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
> > DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param,
> > DRM_AUTH | DRM_RENDER_ALLOW),
> > - DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param,
> > + DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, drm_invalid_op,
> > DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY),
> > DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new,
> > DRM_AUTH | DRM_RENDER_ALLOW),
> >
>
> Thanks! Do you want to take this via drm-misc too, or can I pick it up?
>
Hoping to pick this via drm-misc, albeit I forgot to mention earlier.
Thanks
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op()
2019-05-28 15:41 ` Emil Velikov
@ 2019-05-28 16:49 ` Tomi Valkeinen
0 siblings, 0 replies; 9+ messages in thread
From: Tomi Valkeinen @ 2019-05-28 16:49 UTC (permalink / raw)
To: Emil Velikov; +Cc: dri-devel
On 28/05/2019 18:41, Emil Velikov wrote:
> On 2019/05/28, Tomi Valkeinen wrote:
>> On 22/05/2019 18:02, Emil Velikov wrote:
>>> From: Emil Velikov <emil.velikov@collabora.com>
>>>
>>> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
>>> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
>>> ---
>>> drivers/gpu/drm/omapdrm/omap_drv.c | 16 +---------------
>>> 1 file changed, 1 insertion(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
>>> index 1b9b6f5e48e1..672e0f8ad11c 100644
>>> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
>>> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
>>> @@ -439,20 +439,6 @@ static int ioctl_get_param(struct drm_device *dev, void *data,
>>> return 0;
>>> }
>>> -static int ioctl_set_param(struct drm_device *dev, void *data,
>>> - struct drm_file *file_priv)
>>> -{
>>> - struct drm_omap_param *args = data;
>>> -
>>> - switch (args->param) {
>>> - default:
>>> - DBG("unknown parameter %lld", args->param);
>>> - return -EINVAL;
>>> - }
>>> -
>>> - return 0;
>>> -}
>>> -
>>> #define OMAP_BO_USER_MASK 0x00ffffff /* flags settable by userspace */
>>> static int ioctl_gem_new(struct drm_device *dev, void *data,
>>> @@ -492,7 +478,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
>>> static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
>>> DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param,
>>> DRM_AUTH | DRM_RENDER_ALLOW),
>>> - DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param,
>>> + DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, drm_invalid_op,
>>> DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY),
>>> DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new,
>>> DRM_AUTH | DRM_RENDER_ALLOW),
>>>
>>
>> Thanks! Do you want to take this via drm-misc too, or can I pick it up?
>>
> Hoping to pick this via drm-misc, albeit I forgot to mention earlier.
Sounds fine to me.
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tomi
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-08-06 9:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22 15:02 [PATCH 1/2] drm/omap: remove open-coded drm_invalid_op() Emil Velikov
2019-05-22 15:02 ` [PATCH 2/2] drm/nouveau: " Emil Velikov
[not found] ` <20190522150219.13913-2-emil.l.velikov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-05-23 0:19 ` Ben Skeggs
[not found] ` <CACAvsv5Z7CZOirZrRB=88rCeZt0SvBvdDjbhSpOcfE9JA20hCg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-05-24 15:14 ` Emil Velikov
2019-05-27 6:03 ` Ben Skeggs
2019-08-06 9:42 ` Emil Velikov
2019-05-28 10:54 ` [PATCH 1/2] drm/omap: " Tomi Valkeinen
2019-05-28 15:41 ` Emil Velikov
2019-05-28 16:49 ` Tomi Valkeinen
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.