Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77f31815 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Replace dri1 functions with drm_noop 



Whether we'll reject them or no-op doesn't really matter ...

Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5c6c6003

drivers/gpu/drm/i915/i915_dma.c

+10 −69
Original line number Diff line number Diff line
@@ -50,59 +50,6 @@ 
#include <linux/pm_runtime.h>

#include <linux/oom.h>



static int i915_dma_init(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_flush_ioctl(struct drm_device *dev, void *data,

			    struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_batchbuffer(struct drm_device *dev, void *data,

			    struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_cmdbuffer(struct drm_device *dev, void *data,

			  struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_irq_emit(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_irq_wait(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_vblank_pipe_get(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_vblank_swap(struct drm_device *dev, void *data,

		     struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_flip_bufs(struct drm_device *dev, void *data,

			  struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_getparam(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)
@@ -248,12 +195,6 @@ static int i915_setparam(struct drm_device *dev, void *data, 
	return 0;

}



static int i915_set_status_page(struct drm_device *dev, void *data,

				struct drm_file *file_priv)

{

	return -ENODEV;

}



static int i915_get_bridge_dev(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1090,23 +1031,23 @@ void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) 
}



const struct drm_ioctl_desc i915_ioctls[] = {

	DRM_IOCTL_DEF_DRV(I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_FLUSH, i915_flush_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FLIP, i915_flip_bufs, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_BATCHBUFFER, i915_batchbuffer, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_IRQ_EMIT, i915_irq_emit, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_IRQ_WAIT, i915_irq_wait, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_INIT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_FLUSH, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FLIP, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_BATCHBUFFER, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_IRQ_EMIT, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_IRQ_WAIT, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_GETPARAM, i915_getparam, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_SETPARAM, i915_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_ALLOC, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FREE, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_INIT_HEAP, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_CMDBUFFER, i915_cmdbuffer, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_CMDBUFFER, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_DESTROY_HEAP,  drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_SET_VBLANK_PIPE,  drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GET_VBLANK_PIPE,  i915_vblank_pipe_get, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_HWS_ADDR, i915_set_status_page, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GET_VBLANK_PIPE,  drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_VBLANK_SWAP, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_HWS_ADDR, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GEM_INIT, i915_gem_init_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER2, i915_gem_execbuffer2, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),