diff options
| author |   Tony Lindgren <tony@atomide.com> | 2019-09-23 10:38:20 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-09-23 10:38:20 -0700 |
| commit | c01f5120ca7cf2994336c42b8a9cae697121ffb3 (patch) | |
| tree | d0ac4ed8e3bc4c11203f31b984d300b0f4127978 /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | bus: ti-sysc: Remove unpaired sysc_clkdm_deny_idle() (diff) | |
| parent | DTS: ARM: gta04: introduce legacy spi-cs-high to make display work again (diff) | |
| download | linux-dev-c01f5120ca7cf2994336c42b8a9cae697121ffb3.tar.xz linux-dev-c01f5120ca7cf2994336c42b8a9cae697121ffb3.zip | |
Merge branch 'fixes-merge-window-pt2' into fixes
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 60652ebbdf61..8aa6a31e8ad0 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -128,7 +128,15 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, limits.max_lane_count = intel_dp_max_lane_count(intel_dp); limits.min_bpp = intel_dp_min_bpp(pipe_config); - limits.max_bpp = pipe_config->pipe_bpp; + /* + * FIXME: If all the streams can't fit into the link with + * their current pipe_bpp we should reduce pipe_bpp across + * the board until things start to fit. Until then we + * limit to <= 8bpc since that's what was hardcoded for all + * MST streams previously. This hack should be removed once + * we have the proper retry logic in place. + */ + limits.max_bpp = min(pipe_config->pipe_bpp, 24); intel_dp_adjust_compliance_config(intel_dp, pipe_config, &limits); @@ -539,7 +547,15 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo intel_attach_force_audio_property(connector); intel_attach_broadcast_rgb_property(connector); - drm_connector_attach_max_bpc_property(connector, 6, 12); + + /* + * Reuse the prop from the SST connector because we're + * not allowed to create new props after device registration. + */ + connector->max_bpc_property = + intel_dp->attached_connector->base.max_bpc_property; + if (connector->max_bpc_property) + drm_connector_attach_max_bpc_property(connector, 6, 12); return connector; |