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

Commit 210871b6 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Kill intel_crtc->vbl_wait 



Share the waitqueue that drm_irq uses when performing the vblank evade
trick for atomic pipe updates.

v2: Keep intel_pipe_handle_vblank() (Chris)

Suggested-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 020178a1

drivers/gpu/drm/i915/i915_irq.c

+0 −5
Original line number Diff line number Diff line
@@ -1989,14 +1989,9 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir) 


static bool intel_pipe_handle_vblank(struct drm_device *dev, enum pipe pipe)

{

	struct intel_crtc *crtc;



	if (!drm_handle_vblank(dev, pipe))

		return false;



	crtc = to_intel_crtc(intel_get_crtc_for_pipe(dev, pipe));

	wake_up(&crtc->vbl_wait);



	return true;

}

drivers/gpu/drm/i915/intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -11870,8 +11870,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) 
	intel_crtc->cursor_base = ~0;

	intel_crtc->cursor_cntl = ~0;



	init_waitqueue_head(&intel_crtc->vbl_wait);



	BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||

	       dev_priv->plane_to_crtc_mapping[intel_crtc->plane] != NULL);

	dev_priv->plane_to_crtc_mapping[intel_crtc->plane] = &intel_crtc->base;

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -425,8 +425,6 @@ struct intel_crtc { 
		struct intel_pipe_wm active;

	} wm;



	wait_queue_head_t vbl_wait;



	int scanline_offset;

	struct intel_mmio_flip mmio_flip;

};

drivers/gpu/drm/i915/intel_sprite.c

+3 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl 
	enum pipe pipe = crtc->pipe;

	long timeout = msecs_to_jiffies_timeout(1);

	int scanline, min, max, vblank_start;

	wait_queue_head_t *wq = drm_crtc_vblank_waitqueue(&crtc->base);

	DEFINE_WAIT(wait);



	WARN_ON(!drm_modeset_is_locked(&crtc->base.mutex));
@@ -81,7 +82,7 @@ static bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl 
		 * other CPUs can see the task state update by the time we

		 * read the scanline.

		 */

		prepare_to_wait(&crtc->vbl_wait, &wait, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(wq, &wait, TASK_UNINTERRUPTIBLE);



		scanline = intel_get_crtc_scanline(crtc);

		if (scanline < min || scanline > max)
@@ -100,7 +101,7 @@ static bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl 
		local_irq_disable();

	}



	finish_wait(&crtc->vbl_wait, &wait);

	finish_wait(wq, &wait);



	drm_vblank_put(dev, pipe);