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

Commit 0b701d27 authored by Eric Anholt's avatar Eric Anholt Committed by Keith Packard
Browse files

drm/i915: Move the vblank pre/post modeset to the common crtc_mode_set. 



Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent f564048e

drivers/gpu/drm/i915/intel_display.c

+6 −10
Original line number Diff line number Diff line
@@ -4543,8 +4543,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, 
	u32 lvds_sync = 0;

	int target_clock;



	drm_vblank_pre_modeset(dev, pipe);



	list_for_each_entry(encoder, &mode_config->encoder_list, base.head) {

		if (encoder->base.crtc != crtc)

			continue;
@@ -4601,7 +4599,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, 
	ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk, &clock);

	if (!ok) {

		DRM_ERROR("Couldn't find PLL settings for mode!\n");

		drm_vblank_post_modeset(dev, pipe);

		return -EINVAL;

	}
@@ -5159,8 +5156,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, 


	intel_update_watermarks(dev);



	drm_vblank_post_modeset(dev, pipe);



	return ret;

}
@@ -5191,8 +5186,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 
	u32 lvds_sync = 0;

	int target_clock;



	drm_vblank_pre_modeset(dev, pipe);



	list_for_each_entry(encoder, &mode_config->encoder_list, base.head) {

		if (encoder->base.crtc != crtc)

			continue;
@@ -5249,7 +5242,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 
	ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk, &clock);

	if (!ok) {

		DRM_ERROR("Couldn't find PLL settings for mode!\n");

		drm_vblank_post_modeset(dev, pipe);

		return -EINVAL;

	}
@@ -5807,8 +5799,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 


	intel_update_watermarks(dev);



	drm_vblank_post_modeset(dev, pipe);



	return ret;

}
@@ -5820,11 +5810,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 
{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int pipe = intel_crtc->pipe;

	int ret;



	drm_vblank_pre_modeset(dev, pipe);



	ret = dev_priv->display.crtc_mode_set(crtc, mode, adjusted_mode,

					      x, y, old_fb);



	drm_vblank_post_modeset(dev, pipe);



	return ret;

}