Commit 7cf346fc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2025-05-15' of... 

Merge tag 'drm-intel-next-fixes-2025-05-15' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Stop writing ALPM registers when PSR is enabled
- Use the correct connector while computing the link BPP limit on MST

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://lore.kernel.org/r/aCWlWk5rTE7TH1pN@jlahtine-mobl
parents e31b74b1 eff82fb0

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

+4 −4
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ void intel_alpm_pre_plane_update(struct intel_atomic_state *state, 
	}

}



static void intel_alpm_enable_sink(struct intel_dp *intel_dp,

void intel_alpm_enable_sink(struct intel_dp *intel_dp,

			    const struct intel_crtc_state *crtc_state)

{

	u8 val;
@@ -453,8 +453,8 @@ void intel_alpm_post_plane_update(struct intel_atomic_state *state, 
		intel_atomic_get_old_crtc_state(state, crtc);

	struct intel_encoder *encoder;



	if ((!crtc_state->has_lobf ||

	     crtc_state->has_lobf == old_crtc_state->has_lobf) && !crtc_state->has_psr)

	if (crtc_state->has_psr || !crtc_state->has_lobf ||

	    crtc_state->has_lobf == old_crtc_state->has_lobf)

		return;



	for_each_intel_encoder_mask(display->drm, encoder,

drivers/gpu/drm/i915/display/intel_alpm.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp, 
				    struct drm_connector_state *conn_state);

void intel_alpm_configure(struct intel_dp *intel_dp,

			  const struct intel_crtc_state *crtc_state);

void intel_alpm_enable_sink(struct intel_dp *intel_dp,

			    const struct intel_crtc_state *crtc_state);

void intel_alpm_pre_plane_update(struct intel_atomic_state *state,

				 struct intel_crtc *crtc);

void intel_alpm_post_plane_update(struct intel_atomic_state *state,

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

+4 −3
Original line number Diff line number Diff line
@@ -2524,6 +2524,7 @@ intel_dp_dsc_compute_pipe_bpp_limits(struct intel_dp *intel_dp, 


bool

intel_dp_compute_config_limits(struct intel_dp *intel_dp,

			       struct intel_connector *connector,

			       struct intel_crtc_state *crtc_state,

			       bool respect_downstream_limits,

			       bool dsc,
@@ -2577,7 +2578,7 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp, 
	intel_dp_test_compute_config(intel_dp, crtc_state, limits);



	return intel_dp_compute_config_link_bpp_limits(intel_dp,

						       intel_dp->attached_connector,

						       connector,

						       crtc_state,

						       dsc,

						       limits);
@@ -2638,7 +2639,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, 
	joiner_needs_dsc = intel_dp_joiner_needs_dsc(display, num_joined_pipes);



	dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en ||

		     !intel_dp_compute_config_limits(intel_dp, pipe_config,

		     !intel_dp_compute_config_limits(intel_dp, connector, pipe_config,

						     respect_downstream_limits,

						     false,

						     &limits);
@@ -2672,7 +2673,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, 
			    str_yes_no(ret), str_yes_no(joiner_needs_dsc),

			    str_yes_no(intel_dp->force_dsc_en));



		if (!intel_dp_compute_config_limits(intel_dp, pipe_config,

		if (!intel_dp_compute_config_limits(intel_dp, connector, pipe_config,

						    respect_downstream_limits,

						    true,

						    &limits))

drivers/gpu/drm/i915/display/intel_dp.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ void intel_dp_wait_source_oui(struct intel_dp *intel_dp); 
int intel_dp_output_bpp(enum intel_output_format output_format, int bpp);



bool intel_dp_compute_config_limits(struct intel_dp *intel_dp,

				    struct intel_connector *connector,

				    struct intel_crtc_state *crtc_state,

				    bool respect_downstream_limits,

				    bool dsc,

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

+3 −2
Original line number Diff line number Diff line
@@ -599,12 +599,13 @@ adjust_limits_for_dsc_hblank_expansion_quirk(struct intel_dp *intel_dp, 


static bool

mst_stream_compute_config_limits(struct intel_dp *intel_dp,

				 const struct intel_connector *connector,

				 struct intel_connector *connector,

				 struct intel_crtc_state *crtc_state,

				 bool dsc,

				 struct link_config_limits *limits)

{

	if (!intel_dp_compute_config_limits(intel_dp, crtc_state, false, dsc,

	if (!intel_dp_compute_config_limits(intel_dp, connector,

					    crtc_state, false, dsc,

					    limits))

		return false;