summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2024-01-29 01:23:05 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2024-01-29 01:23:05 +0000
commite8d9465d49b0223a0e2a9a2210db3973a1106f68 (patch)
treee5ad9eb09ec8a4b03510e5e9424a0777f49d2cb5 /sys/dev/pci/drm/i915
parent164b70ee2532ae51a2b57eec270614a3d4120239 (diff)
drm/dp_mst: Fix fractional DSC bpp handling
From Ville Syrjala 4e042f022255604c68ab5d5f73c8f437d24d651e in linux-6.6.y/6.6.14 7707dd6022593f3edd8e182e7935870cf326f874 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/i915')
-rw-r--r--sys/dev/pci/drm/i915/display/intel_dp_mst.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/display/intel_dp_mst.c b/sys/dev/pci/drm/i915/display/intel_dp_mst.c
index 77bd1313c80..f104bd7f8c2 100644
--- a/sys/dev/pci/drm/i915/display/intel_dp_mst.c
+++ b/sys/dev/pci/drm/i915/display/intel_dp_mst.c
@@ -109,8 +109,7 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
continue;
crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock,
- dsc ? bpp << 4 : bpp,
- dsc);
+ bpp << 4);
slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr,
connector->port,
@@ -941,7 +940,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
return ret;
if (mode_rate > max_rate || mode->clock > max_dotclk ||
- drm_dp_calc_pbn_mode(mode->clock, min_bpp, false) > port->full_pbn) {
+ drm_dp_calc_pbn_mode(mode->clock, min_bpp << 4) > port->full_pbn) {
*status = MODE_CLOCK_HIGH;
return 0;
}