drm/i915/dp: Fix dsc bpp calculations.
PATCH 1/23 drm/i915/dp: Fix dsc bpp calculations.
There was a integer wraparound when mode_clock became too high, and we didn't correct for the FEC overhead factor when dividing, also the calculations would break at HBR3.
As a result our calculated bpp was way too high, and the link width bpp limitation never came into effect.
Print out the resulting bpp calcululations as a sanity check, just in case we ever have to debug it later on again.
--- drivers/gpu/drm/i915/display/intel_dp.c | 20 +++++++++++--------- drivers/gpu/drm/i915/display/intel_dp.h | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +11 -9
@@ -4363,10 +4363,10 @@ intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector)DP_DPRX_ESI_LEN ; } -u16 intel_dp_dsc_get_output_bpp (int link_clock,u8 lane_count, -int mode_clock,int mode_hdisplay) +u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay) { -u16 bits_per_pixel, max_bpp_small_joiner_ram; +u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;/*
@@ -4375,13 +4375,14 @@ u16 intel_dp_dsc_get_output_bpp(int link_clock, u8 lane_count,* FECOverhead = 2.4%, for SST -> TimeSlotsPerMTP is 1, * for MST -> TimeSlotsPerMTP has to be calculated */ - bits_per_pixel = (link_clock * lane_count *8 * -DP_DSC_FEC_OVERHEAD_FACTOR ) / - mode_clock; + bits_per_pixel = +mul_u32_u32 (link_clock, lane_count *8 *DP_DSC_FEC_OVERHEAD_FACTOR ) / +mul_u32_u32 (1000ULL , mode_clock); +DRM_DEBUG_KMS ("Max link bpp: %u\n" , bits_per_pixel);/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ - max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / - mode_hdisplay; + max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay; +DRM_DEBUG_KMS ("Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);/* * Greatest allowed DSC BPP = MIN (output BPP from avaialble Link BW
@@ -4391,7 +4392,8 @@ u16 intel_dp_dsc_get_output_bpp(int link_clock, u8 lane_count,/* Error out if the max bpp is less than smallest allowed valid bpp */ if (bits_per_pixel < valid_dsc_bpp[0 ]) { -DRM_DEBUG_KMS ("Unsupported BPP %d\n" , bits_per_pixel); +DRM_DEBUG_KMS ("Unsupported BPP %u, min %u\n" , + bits_per_pixel, valid_dsc_bpp[0 ]);return 0 ; }
drivers/gpu/drm/i915/display/intel_dp.h +2 -2
@@ -103,8 +103,8 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);bool intel_dp_source_supports_hbr3 (struct intel_dp *intel_dp);bool intel_dp_get_link_status (struct intel_dp *intel_dp,u8 *link_status); -u16 intel_dp_dsc_get_output_bpp (int link_clock,u8 lane_count, -int mode_clock,int mode_hdisplay); +u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay);u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock,int mode_hdisplay);
Signature · 1 line
2.20.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hey,
Op 12-09-2019 om 16:34 schreef Sasha Levin:
Quoted 13 lines
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit:d9218c8f6cf4drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC.The bot has tested the following trees: v5.2.14.
v5.2.14: Failed to apply! Possible dependencies:
Unable to calculate
Quoted 7 lines
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks,
Sasha
Why is this bot asking for patches on the trybot mailing list?
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Maarten Lankhorst
Hey,
Op 12-09-2019 om 16:34 schreef Sasha Levin:
Quoted 15 lines
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit:d9218c8f6cf4drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC.The bot has tested the following trees: v5.2.14.
v5.2.14: Failed to apply! Possible dependencies:
Unable to calculateNOTE: The patch will not be queued to stable trees until it is upstream.
Quoted 7 lines
Quoted 5 lines
How should we proceed with this patch?
--
Thanks,
SashaWhy is this bot asking for patches on the trybot mailing list?
Did you forget --suppress-cc=all ?
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Op 12-09-2019 om 20:05 schreef Ville Syrjälä:
Quoted 19 lines · Maarten Lankhorst
Quoted 18 lines
Hey,
Op 12-09-2019 om 16:34 schreef Sasha Levin:
Quoted 15 lines
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit:d9218c8f6cf4drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC.The bot has tested the following trees: v5.2.14.
v5.2.14: Failed to apply! Possible dependencies:
Unable to calculateNOTE: The patch will not be queued to stable trees until it is upstream.
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
How should we proceed with this patch?
--
Thanks,
SashaWhy is this bot asking for patches on the trybot mailing list?
Did you forget --suppress-cc=all ?
Ah that's it, thanks! :)
~Maarten