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

Commit 7905df29 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Use intel_pipe_will_have_type() in ironlake_crtc_compute_clock() 



ironlake_crtc_compute_clock() gets called during atomic compute phase,
so we must check the future pipe type instead of the current type.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448462131-13321-1-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent cda0aaaf

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -8932,7 +8932,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, 
	memset(&crtc_state->dpll_hw_state, 0,

	memset(&crtc_state->dpll_hw_state, 0,

	       sizeof(crtc_state->dpll_hw_state));

	       sizeof(crtc_state->dpll_hw_state));





	is_lvds = intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS);

	is_lvds = intel_pipe_will_have_type(crtc_state, INTEL_OUTPUT_LVDS);





	WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)),

	WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)),

	     "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev));

	     "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev));