Skip to content

Commit 578ff98

Browse files
vsrini4vsyrjala
authored andcommitted
drm/i915: Allow bigjoiner for MST
We need bigjoiner support with MST functionality for MST monitor resolutions > 5K to work. Adding support for the same. v2: Addressed review comments from Jani. Revert rejection of MST bigjoiner modes and add functionality v3: Fixed pipe_mismatch WARN for mst_master_transcoder Credits-to: Manasi Navare <[email protected]> v4: Utilize intel_crtc_joined_pipe_mask() also for handling bigjoiner slave pipes for MST case(Stan) [v5: vsyrjala: chunked the modeset squence stuff out, removed bogus mst master transcoder hack, keep mgr_lock near the full_pbn check] [v6: vsyrjala: Calculate DSC slices correctly for bigjoiner (Imre)] Reviewed-by: Manasi Navare <[email protected]> Reviewed-by: Arun R Murthy <[email protected]> Signed-off-by: Vidya Srinivas <[email protected]> Co-developed-by: Ville Syrjälä <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent d403b06 commit 578ff98

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,10 @@ static int intel_dp_mst_bw_overhead(const struct intel_crtc_state *crtc_state,
8888

8989
if (dsc) {
9090
flags |= DRM_DP_BW_OVERHEAD_DSC;
91-
/* TODO: add support for bigjoiner */
9291
dsc_slice_count = intel_dp_dsc_get_slice_count(connector,
9392
adjusted_mode->clock,
9493
adjusted_mode->hdisplay,
95-
false);
94+
crtc_state->bigjoiner_pipes);
9695
}
9796

9897
overhead = drm_dp_bw_overhead(crtc_state->lane_count,
@@ -525,6 +524,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
525524
{
526525
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
527526
struct intel_atomic_state *state = to_intel_atomic_state(conn_state->state);
527+
struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
528528
struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
529529
struct intel_dp *intel_dp = &intel_mst->primary->dp;
530530
struct intel_connector *connector =
@@ -542,6 +542,11 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
542542
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
543543
return -EINVAL;
544544

545+
if (intel_dp_need_bigjoiner(intel_dp, connector,
546+
adjusted_mode->crtc_hdisplay,
547+
adjusted_mode->crtc_clock))
548+
pipe_config->bigjoiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe);
549+
545550
pipe_config->sink_format = INTEL_OUTPUT_FORMAT_RGB;
546551
pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
547552
pipe_config->has_pch_encoder = false;
@@ -1376,10 +1381,6 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
13761381
max_link_clock, max_lanes);
13771382
mode_rate = intel_dp_link_required(mode->clock, min_bpp);
13781383

1379-
ret = drm_modeset_lock(&mgr->base.lock, ctx);
1380-
if (ret)
1381-
return ret;
1382-
13831384
/*
13841385
* TODO:
13851386
* - Also check if compression would allow for the mode
@@ -1392,17 +1393,18 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
13921393
* corresponding link capabilities of the sink) in case the
13931394
* stream is uncompressed for it by the last branch device.
13941395
*/
1395-
if (mode_rate > max_rate || mode->clock > max_dotclk ||
1396-
drm_dp_calc_pbn_mode(mode->clock, min_bpp << 4) > port->full_pbn) {
1397-
*status = MODE_CLOCK_HIGH;
1398-
return 0;
1399-
}
14001396
if (intel_dp_need_bigjoiner(intel_dp, intel_connector,
14011397
mode->hdisplay, target_clock)) {
14021398
bigjoiner = true;
14031399
max_dotclk *= 2;
1400+
}
1401+
1402+
ret = drm_modeset_lock(&mgr->base.lock, ctx);
1403+
if (ret)
1404+
return ret;
14041405

1405-
/* TODO: add support for bigjoiner */
1406+
if (mode_rate > max_rate || mode->clock > max_dotclk ||
1407+
drm_dp_calc_pbn_mode(mode->clock, min_bpp << 4) > port->full_pbn) {
14061408
*status = MODE_CLOCK_HIGH;
14071409
return 0;
14081410
}
@@ -1445,7 +1447,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
14451447
return 0;
14461448
}
14471449

1448-
*status = intel_mode_valid_max_plane_size(dev_priv, mode, false);
1450+
*status = intel_mode_valid_max_plane_size(dev_priv, mode, bigjoiner);
14491451
return 0;
14501452
}
14511453

0 commit comments

Comments
 (0)