Commit 42ebf3b3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2026-02-13' of... 

Merge tag 'drm-intel-next-fixes-2026-02-13' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Regresion fix for HDR 4k displays (#15503)
- Fixup for Dell XPS 13 7390 eDP rate limit
- Memory leak fix on ACPI _DSM handling

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patch.msgid.link/aY8CtbhijtetQ6P3@jlahtine-mobl
parents 218da120 57b85fd5

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

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static void intel_dsm_platform_mux_info(acpi_handle dhandle) 


	if (!pkg->package.count) {

		DRM_DEBUG_DRIVER("no connection in _DSM\n");

		ACPI_FREE(pkg);

		return;

	}

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

+17 −3
Original line number Diff line number Diff line
@@ -2665,6 +2665,7 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp, 
			       bool dsc,

			       struct link_config_limits *limits)

{

	struct intel_display *display = to_intel_display(intel_dp);

	bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);

	struct intel_connector *connector =

		to_intel_connector(conn_state->connector);
@@ -2677,8 +2678,7 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp, 
	limits->min_lane_count = intel_dp_min_lane_count(intel_dp);

	limits->max_lane_count = intel_dp_max_lane_count(intel_dp);



	limits->pipe.min_bpp = intel_dp_in_hdr_mode(conn_state) ? 30 :

				intel_dp_min_bpp(crtc_state->output_format);

	limits->pipe.min_bpp = intel_dp_min_bpp(crtc_state->output_format);

	if (is_mst) {

		/*

		 * FIXME: If all the streams can't fit into the link with their
@@ -2694,6 +2694,19 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp, 
							respect_downstream_limits);

	}



	if (!dsc && intel_dp_in_hdr_mode(conn_state)) {

		if (intel_dp_supports_dsc(intel_dp, connector, crtc_state) &&

		    limits->pipe.max_bpp >= 30)

			limits->pipe.min_bpp = max(limits->pipe.min_bpp, 30);

		else

			drm_dbg_kms(display->drm,

				    "[CONNECTOR:%d:%s] Can't force 30 bpp for HDR (pipe bpp: %d-%d DSC-support: %s)\n",

				    connector->base.base.id, connector->base.name,

				    limits->pipe.min_bpp, limits->pipe.max_bpp,

				    str_yes_no(intel_dp_supports_dsc(intel_dp, connector,

								     crtc_state)));

	}



	if (dsc && !intel_dp_dsc_compute_pipe_bpp_limits(connector, limits))

		return false;
@@ -2825,10 +2838,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, 
	}



	drm_dbg_kms(display->drm,

		    "DP lane count %d clock %d bpp input %d compressed " FXP_Q4_FMT " link rate required %d available %d\n",

		    "DP lane count %d clock %d bpp input %d compressed " FXP_Q4_FMT " HDR %s link rate required %d available %d\n",

		    pipe_config->lane_count, pipe_config->port_clock,

		    pipe_config->pipe_bpp,

		    FXP_Q4_ARGS(pipe_config->dsc.compressed_bpp_x16),

		    str_yes_no(intel_dp_in_hdr_mode(conn_state)),

		    intel_dp_config_required_rate(pipe_config),

		    intel_dp_max_link_data_rate(intel_dp,

						pipe_config->port_clock,

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

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static struct intel_quirk intel_quirks[] = { 
	{ 0x0f31, 0x103c, 0x220f, quirk_invert_brightness },



	/* Dell XPS 13 7390 2-in-1 */

	{ 0x8a12, 0x1028, 0x08b0, quirk_edp_limit_rate_hbr2 },

	{ 0x8a52, 0x1028, 0x08b0, quirk_edp_limit_rate_hbr2 },

};



static const struct intel_dpcd_quirk intel_dpcd_quirks[] = {