diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-09-12 23:11:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-09-12 23:11:36 +1000 |
| commit | 911ad0b6110d385474cb1dd91b1ef51ca6aeff93 (patch) | |
| tree | 5215836a9ed3780c45e3ce852e6d0e9ef6aec461 /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | Linux 5.3-rc8 (diff) | |
| parent | drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE) for skl+ (diff) | |
| download | linux-dev-911ad0b6110d385474cb1dd91b1ef51ca6aeff93.tar.xz linux-dev-911ad0b6110d385474cb1dd91b1ef51ca6aeff93.zip | |
Merge tag 'drm-intel-fixes-2019-09-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Final drm/i915 fixes for v5.3:
- Fox DP MST high color depth regression
- Fix GPU hangs on Vulkan compute workloads
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/877e6e27qm.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 18e4cba76720..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); |