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

Commit 284d9529 authored by Keith Packard's avatar Keith Packard
Browse files

drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again) 



This change got placed in the ironlake path instead of the 9xx path
during a recent code shuffle.

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent ef239801

drivers/gpu/drm/i915/intel_display.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -4687,6 +4687,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, 




	I915_WRITE(DSPCNTR(plane), dspcntr);

	I915_WRITE(DSPCNTR(plane), dspcntr);

	POSTING_READ(DSPCNTR(plane));

	POSTING_READ(DSPCNTR(plane));

	intel_enable_plane(dev_priv, plane, pipe);





	ret = intel_pipe_set_base(crtc, x, y, old_fb);

	ret = intel_pipe_set_base(crtc, x, y, old_fb);
@@ -5217,8 +5218,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 




	I915_WRITE(DSPCNTR(plane), dspcntr);

	I915_WRITE(DSPCNTR(plane), dspcntr);

	POSTING_READ(DSPCNTR(plane));

	POSTING_READ(DSPCNTR(plane));

	if (!HAS_PCH_SPLIT(dev))

		intel_enable_plane(dev_priv, plane, pipe);





	ret = intel_pipe_set_base(crtc, x, y, old_fb);

	ret = intel_pipe_set_base(crtc, x, y, old_fb);