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

Commit 71b14ab6 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: No-Op enter/leave vt gem ioctl 



We've killed ums support by now, it's time to reap the benefits. This
one here is getting in the way of doing some ring init cleanup.

Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent ac883c84

drivers/gpu/drm/i915/i915_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -1047,8 +1047,8 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_GEM_SET_CACHING, i915_gem_set_caching_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_GET_CACHING, i915_gem_get_caching_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_ENTERVT, i915_gem_entervt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_ENTERVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_CREATE, i915_gem_create_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_PREAD, i915_gem_pread_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_PWRITE, i915_gem_pwrite_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

drivers/gpu/drm/i915/i915_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -2441,10 +2441,6 @@ int i915_gem_throttle_ioctl(struct drm_device *dev, void *data, 
			    struct drm_file *file_priv);

int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,

			   struct drm_file *file_priv);

int i915_gem_entervt_ioctl(struct drm_device *dev, void *data,

			   struct drm_file *file_priv);

int i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,

			   struct drm_file *file_priv);

int i915_gem_set_tiling(struct drm_device *dev, void *data,

			struct drm_file *file_priv);

int i915_gem_get_tiling(struct drm_device *dev, void *data,

drivers/gpu/drm/i915/i915_gem.c

+0 −55
Original line number Diff line number Diff line
@@ -4976,61 +4976,6 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev) 
		dev_priv->gt.cleanup_ring(ring);

}



int

i915_gem_entervt_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return 0;



	if (i915_reset_in_progress(&dev_priv->gpu_error)) {

		DRM_ERROR("Reenabling wedged hardware, good luck\n");

		atomic_set(&dev_priv->gpu_error.reset_counter, 0);

	}



	mutex_lock(&dev->struct_mutex);

	dev_priv->ums.mm_suspended = 0;



	ret = i915_gem_init_hw(dev);

	if (ret != 0) {

		mutex_unlock(&dev->struct_mutex);

		return ret;

	}



	BUG_ON(!list_empty(&dev_priv->gtt.base.active_list));



	ret = drm_irq_install(dev, dev->pdev->irq);

	if (ret)

		goto cleanup_ringbuffer;

	mutex_unlock(&dev->struct_mutex);



	return 0;



cleanup_ringbuffer:

	i915_gem_cleanup_ringbuffer(dev);

	dev_priv->ums.mm_suspended = 1;

	mutex_unlock(&dev->struct_mutex);



	return ret;

}



int

i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return 0;



	mutex_lock(&dev->struct_mutex);

	drm_irq_uninstall(dev);

	mutex_unlock(&dev->struct_mutex);



	return i915_gem_suspend(dev);

}



void

i915_gem_lastclose(struct drm_device *dev)

{