Skip to content

Commit bb1a71f

Browse files
vsyrjalajnikula
authored andcommitted
drm/i915: Limit MST to <= 8bpc once again
My attempt at allowing MST to use the higher color depths has regressed some configurations. Apparently people have setups where all MST streams will fit into the DP link with 8bpc but won't fit with higher color depths. What we really should be doing is reducing the bpc for all the streams on the same link until they start to fit. But that requires a bit more work, so in the meantime let's revert back closer to the old behavior and limit MST to at most 8bpc. Cc: [email protected] Cc: Lyude Paul <[email protected]> Tested-by: Geoffrey Bennett <[email protected]> Fixes: f147721 ("drm/i915: Remove the 8bpc shackles from DP MST") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111505 Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Lyude Paul <[email protected]> (cherry picked from commit 75427b2) Signed-off-by: Jani Nikula <[email protected]>
1 parent f74c2bb commit bb1a71f

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,15 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
128128
limits.max_lane_count = intel_dp_max_lane_count(intel_dp);
129129

130130
limits.min_bpp = intel_dp_min_bpp(pipe_config);
131-
limits.max_bpp = pipe_config->pipe_bpp;
131+
/*
132+
* FIXME: If all the streams can't fit into the link with
133+
* their current pipe_bpp we should reduce pipe_bpp across
134+
* the board until things start to fit. Until then we
135+
* limit to <= 8bpc since that's what was hardcoded for all
136+
* MST streams previously. This hack should be removed once
137+
* we have the proper retry logic in place.
138+
*/
139+
limits.max_bpp = min(pipe_config->pipe_bpp, 24);
132140

133141
intel_dp_adjust_compliance_config(intel_dp, pipe_config, &limits);
134142

0 commit comments

Comments
 (0)