Commit 67028421 authored by Sean Paul's avatar Sean Paul
Browse files

Revert "drm/nouveau: remove open-coded drm_invalid_op()" 



This reverts commit ccdae425.

Mandatory review was missing from this patch.

Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807142101.251400-6-sean@poorly.run
parent 7d5000d7

drivers/gpu/drm/nouveau/nouveau_abi16.c

+6 −0
Original line number Diff line number Diff line
@@ -244,6 +244,12 @@ 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)

{

drivers/gpu/drm/nouveau/nouveau_abi16.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
	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);

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,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_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc, DRM_RENDER_ALLOW),

CRA Git | Maintained and supported by SUSTech CRA and CCSE