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

Commit c668cde5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove setparam ioctl 



This was only used for the ums+gem combo, so ripe for removal now that
we only have kms code left.

v2: Drop fence_reg_start since it's now unused, noticed by Ville.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0731c65a

drivers/gpu/drm/i915/i915_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -957,7 +957,6 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data) 
	if (ret)

		return ret;



	seq_printf(m, "Reserved fences = %d\n", dev_priv->fence_reg_start);

	seq_printf(m, "Total fences = %d\n", dev_priv->num_fence_regs);

	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		struct drm_i915_gem_object *obj = dev_priv->fence_regs[i].obj;

drivers/gpu/drm/i915/i915_dma.c

+2 −31
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = 1;

		break;

	case I915_PARAM_NUM_FENCES_AVAIL:

		value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;

		value = dev_priv->num_fence_regs;

		break;

	case I915_PARAM_HAS_OVERLAY:

		value = dev_priv->overlay ? 1 : 0;
@@ -183,35 +183,6 @@ static int i915_getparam(struct drm_device *dev, void *data, 
	return 0;

}



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

			 struct drm_file *file_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	drm_i915_setparam_t *param = data;



	switch (param->param) {

	case I915_SETPARAM_USE_MI_BATCHBUFFER_START:

	case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:

	case I915_SETPARAM_ALLOW_BATCHBUFFER:

		/* Reject all old ums/dri params. */

		return -ENODEV;



	case I915_SETPARAM_NUM_USED_FENCES:

		if (param->value > dev_priv->num_fence_regs ||

		    param->value < 0)

			return -EINVAL;

		/* Userspace can use first N regs */

		dev_priv->fence_reg_start = param->value;

		break;

	default:

		DRM_DEBUG_DRIVER("unknown parameter %d\n",

					param->param);

		return -EINVAL;

	}



	return 0;

}



static int i915_get_bridge_dev(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1226,7 +1197,7 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
	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_SETPARAM, drm_noop, 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),

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1790,7 +1790,6 @@ struct drm_i915_private { 
	struct mutex pps_mutex;



	struct drm_i915_fence_reg fence_regs[I915_MAX_NUM_FENCES]; /* assume 965 */

	int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */

	int num_fence_regs; /* 8 on pre-965, 16 otherwise */



	unsigned int fsb_freq, mem_freq, is_ddr3;

drivers/gpu/drm/i915/i915_gem_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ i915_find_fence_reg(struct drm_device *dev) 


	/* First try to find a free reg */

	avail = NULL;

	for (i = dev_priv->fence_reg_start; i < dev_priv->num_fence_regs; i++) {

	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		reg = &dev_priv->fence_regs[i];

		if (!reg->obj)

			return reg;