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

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

drm/i915: Can i915_gem_init_ioctl 



Found one more!

With this we can clear up the ggtt init code a bit, yay!

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

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
	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_INIT, drm_noop, 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),

	DRM_IOCTL_DEF_DRV(I915_GEM_PIN, i915_gem_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY|DRM_UNLOCKED),

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -2378,8 +2378,6 @@ void ibx_display_interrupt_update(struct drm_i915_private *dev_priv, 
	ibx_display_interrupt_update((dev_priv), (bits), 0)



/* i915_gem.c */

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

			struct drm_file *file_priv);

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

			  struct drm_file *file_priv);

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

drivers/gpu/drm/i915/i915_gem.c

+0 −27
Original line number Diff line number Diff line
@@ -159,33 +159,6 @@ i915_gem_object_is_inactive(struct drm_i915_gem_object *obj) 
	return i915_gem_obj_bound_any(obj) && !obj->active;

}



int

i915_gem_init_ioctl(struct drm_device *dev, void *data,

		    struct drm_file *file)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_init *args = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	if (args->gtt_start >= args->gtt_end ||

	    (args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1))

		return -EINVAL;



	/* GEM with user mode setting was never supported on ilk and later. */

	if (INTEL_INFO(dev)->gen >= 5)

		return -ENODEV;



	mutex_lock(&dev->struct_mutex);

	i915_gem_setup_global_gtt(dev, args->gtt_start, args->gtt_end,

				  args->gtt_end);

	dev_priv->gtt.mappable_end = args->gtt_end;

	mutex_unlock(&dev->struct_mutex);



	return 0;

}



int

i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,

			    struct drm_file *file)

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −4
Original line number Diff line number Diff line
@@ -1664,7 +1664,7 @@ static void i915_gtt_color_adjust(struct drm_mm_node *node, 
	}

}



int i915_gem_setup_global_gtt(struct drm_device *dev,

static int i915_gem_setup_global_gtt(struct drm_device *dev,

				     unsigned long start,

				     unsigned long mappable_end,

				     unsigned long end)

drivers/gpu/drm/i915/i915_gem_gtt.h

+0 −2
Original line number Diff line number Diff line
@@ -274,8 +274,6 @@ struct i915_hw_ppgtt { 


int i915_gem_gtt_init(struct drm_device *dev);

void i915_gem_init_global_gtt(struct drm_device *dev);

int i915_gem_setup_global_gtt(struct drm_device *dev, unsigned long start,

			      unsigned long mappable_end, unsigned long end);

void i915_global_gtt_cleanup(struct drm_device *dev);