Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patch.msgid.link/aY8CtbhijtetQ6P3@jlahtine-mobl
+19
-4
+1
drivers/gpu/drm/i915/display/intel_acpi.c
+1
drivers/gpu/drm/i915/display/intel_acpi.c
+17
-3
drivers/gpu/drm/i915/display/intel_dp.c
+17
-3
drivers/gpu/drm/i915/display/intel_dp.c
···
2665
2665
bool dsc,
2666
2666
struct link_config_limits *limits)
2667
2667
{
2668
+
struct intel_display *display = to_intel_display(intel_dp);
2668
2669
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
2669
2670
struct intel_connector *connector =
2670
2671
to_intel_connector(conn_state->connector);
···
2678
2677
limits->min_lane_count = intel_dp_min_lane_count(intel_dp);
2679
2678
limits->max_lane_count = intel_dp_max_lane_count(intel_dp);
2680
2679
2681
-
limits->pipe.min_bpp = intel_dp_in_hdr_mode(conn_state) ? 30 :
2682
-
intel_dp_min_bpp(crtc_state->output_format);
2680
+
limits->pipe.min_bpp = intel_dp_min_bpp(crtc_state->output_format);
2683
2681
if (is_mst) {
2684
2682
/*
2685
2683
* FIXME: If all the streams can't fit into the link with their
···
2692
2692
} else {
2693
2693
limits->pipe.max_bpp = intel_dp_max_bpp(intel_dp, crtc_state,
2694
2694
respect_downstream_limits);
2695
+
}
2696
+
2697
+
if (!dsc && intel_dp_in_hdr_mode(conn_state)) {
2698
+
if (intel_dp_supports_dsc(intel_dp, connector, crtc_state) &&
2699
+
limits->pipe.max_bpp >= 30)
2700
+
limits->pipe.min_bpp = max(limits->pipe.min_bpp, 30);
2701
+
else
2702
+
drm_dbg_kms(display->drm,
2703
+
"[CONNECTOR:%d:%s] Can't force 30 bpp for HDR (pipe bpp: %d-%d DSC-support: %s)\n",
2704
+
connector->base.base.id, connector->base.name,
2705
+
limits->pipe.min_bpp, limits->pipe.max_bpp,
2706
+
str_yes_no(intel_dp_supports_dsc(intel_dp, connector,
2707
+
crtc_state)));
2695
2708
}
2696
2709
2697
2710
if (dsc && !intel_dp_dsc_compute_pipe_bpp_limits(connector, limits))
···
2838
2825
}
2839
2826
2840
2827
drm_dbg_kms(display->drm,
2841
-
"DP lane count %d clock %d bpp input %d compressed " FXP_Q4_FMT " link rate required %d available %d\n",
2828
+
"DP lane count %d clock %d bpp input %d compressed " FXP_Q4_FMT " HDR %s link rate required %d available %d\n",
2842
2829
pipe_config->lane_count, pipe_config->port_clock,
2843
2830
pipe_config->pipe_bpp,
2844
2831
FXP_Q4_ARGS(pipe_config->dsc.compressed_bpp_x16),
2832
+
str_yes_no(intel_dp_in_hdr_mode(conn_state)),
2845
2833
intel_dp_config_required_rate(pipe_config),
2846
2834
intel_dp_max_link_data_rate(intel_dp,
2847
2835
pipe_config->port_clock,
+1
-1
drivers/gpu/drm/i915/display/intel_quirks.c
+1
-1
drivers/gpu/drm/i915/display/intel_quirks.c
···
239
239
{ 0x0f31, 0x103c, 0x220f, quirk_invert_brightness },
240
240
241
241
/* Dell XPS 13 7390 2-in-1 */
242
-
{ 0x8a12, 0x1028, 0x08b0, quirk_edp_limit_rate_hbr2 },
242
+
{ 0x8a52, 0x1028, 0x08b0, quirk_edp_limit_rate_hbr2 },
243
243
};
244
244
245
245
static const struct intel_dpcd_quirk intel_dpcd_quirks[] = {