drm/i915: Call drm_vblank_post_modeset() on error paths. (1f803ee5) · Commits · 戴 / test

Ensure that the drm_vblank_pre_modeset() is always balanced by drm_vblank_post_modeset() within intel_crtc_mode_set(). Signed-off-by:

drivers/gpu/drm/i915/intel_display.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1598,6 +1598,7 @@ static int intel_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;
		}

		@@ -1858,12 +1859,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,

		/* Flush the plane changes */
		ret = intel_pipe_set_base(crtc, x, y, old_fb);
		if (ret != 0)
		return ret;

		drm_vblank_post_modeset(dev, pipe);

		return 0;
		return ret;
		}

		/** Loads the palette/gamma unit for the CRTC with the prepared values */