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

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

drm/i915: move dri1 vblank stubs to i915_dma.c 



i915_dma.c contains most of the old dri1 horror-show, so move
the remaining bits there, too. The code has been removed and
the only thing left are some stubs to ensure that userspace
doesn't try to use this stuff. vblank_pipe_set only returns 0
without any side-effects, so we can even stub it out with
the canonical drm_noop.

v2: Rebase against ENODEV changes.

Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7001f22f

drivers/gpu/drm/i915/i915_dma.c

+43 −1
Original line number Diff line number Diff line
@@ -721,6 +721,48 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, 
	return ret;

}



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

			 struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	drm_i915_vblank_pipe_t *pipe = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

	}



	pipe->pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;



	return 0;

}



/**

 * Schedule buffer swap at given vertical blank.

 */

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

		     struct drm_file *file_priv)

{

	/* The delayed swap mechanism was fundamentally racy, and has been

	 * removed.  The model was that the client requested a delayed flip/swap

	 * from the kernel, then waited for vblank before continuing to perform

	 * rendering.  The problem was that the kernel might wake the client

	 * up before it dispatched the vblank swap (since the lock has to be

	 * held while touching the ringbuffer), in which case the client would

	 * clear and start the next frame before the swap occurred, and

	 * flicker would occur in addition to likely missing the vblank.

	 *

	 * In the absence of this ioctl, userland falls back to a correct path

	 * of waiting for a vblank, then dispatching the swap on its own.

	 * Context switching to userland and back is plenty fast enough for

	 * meeting the requirements of vblank swapping.

	 */

	return -EINVAL;

}



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

			  struct drm_file *file_priv)

{
@@ -2162,7 +2204,7 @@ struct drm_ioctl_desc i915_ioctls[] = { 
	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_DESTROY_HEAP,  drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_SET_VBLANK_PIPE,  i915_vblank_pipe_set, 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),

drivers/gpu/drm/i915/i915_drv.h

+0 −7
Original line number Diff line number Diff line
@@ -1156,13 +1156,6 @@ extern int i915_irq_wait(struct drm_device *dev, void *data, 


extern void intel_irq_init(struct drm_device *dev);



extern int i915_vblank_pipe_set(struct drm_device *dev, void *data,

				struct drm_file *file_priv);

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

				struct drm_file *file_priv);

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

			    struct drm_file *file_priv);



void

i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);

drivers/gpu/drm/i915/i915_irq.c

+0 −61
Original line number Diff line number Diff line
@@ -1636,67 +1636,6 @@ static void valleyview_disable_vblank(struct drm_device *dev, int pipe) 
	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

}





/* Set the vblank monitor pipe

 */

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

			 struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = dev->dev_private;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

	}



	return 0;

}



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

			 struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	drm_i915_vblank_pipe_t *pipe = data;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

	}



	pipe->pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;



	return 0;

}



/**

 * Schedule buffer swap at given vertical blank.

 */

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

		     struct drm_file *file_priv)

{

	/* The delayed swap mechanism was fundamentally racy, and has been

	 * removed.  The model was that the client requested a delayed flip/swap

	 * from the kernel, then waited for vblank before continuing to perform

	 * rendering.  The problem was that the kernel might wake the client

	 * up before it dispatched the vblank swap (since the lock has to be

	 * held while touching the ringbuffer), in which case the client would

	 * clear and start the next frame before the swap occurred, and

	 * flicker would occur in addition to likely missing the vblank.

	 *

	 * In the absence of this ioctl, userland falls back to a correct path

	 * of waiting for a vblank, then dispatching the swap on its own.

	 * Context switching to userland and back is plenty fast enough for

	 * meeting the requirements of vblank swapping.

	 */

	return -EINVAL;

}



static u32

ring_last_seqno(struct intel_ring_buffer *ring)

{