Commit 94d39d01 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-05-25' of... 

Merge tag 'drm-intel-fixes-2023-05-25' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

PIPEDMC disabling fix for bigjoiner config

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZG9aROGyc947/J1l@jlahtine-mobl.ger.corp.intel.com
parents 44c026a7 45dfbd99

drivers/gpu/drm/i915/display/intel_display.c

+10 −2
Original line number Diff line number Diff line
@@ -1851,9 +1851,17 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, 


	intel_disable_shared_dpll(old_crtc_state);



	if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) {

		struct intel_crtc *slave_crtc;



		intel_encoders_post_pll_disable(state, crtc);



		intel_dmc_disable_pipe(i915, crtc->pipe);



		for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc,

						 intel_crtc_bigjoiner_slave_pipes(old_crtc_state))

			intel_dmc_disable_pipe(i915, slave_crtc->pipe);

	}

}



static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)