Commit a0cea65e authored by Jesse Barnes's avatar Jesse Barnes Committed by Greg Kroah-Hartman

drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks

commit d660467c upstream.

A very high dotclock (e.g. 229500kHz as reported by Anton) can cause
the entries_required variable to overflow, potentially leading to a
FIFO watermark value that's too low to support the given mode.  Split
the division across the calculation to avoid this.
Reported-by: default avatarAnton Khirnov <wyskas@gmail.com>
Tested-by: default avatarAnton Khirnov <wyskas@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 29732ca5
...@@ -1858,7 +1858,14 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz, ...@@ -1858,7 +1858,14 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
{ {
long entries_required, wm_size; long entries_required, wm_size;
entries_required = (clock_in_khz * pixel_size * latency_ns) / 1000000; /*
* Note: we need to make sure we don't overflow for various clock &
* latency values.
* clocks go from a few thousand to several hundred thousand.
* latency is usually a few thousand
*/
entries_required = ((clock_in_khz / 1000) * pixel_size * latency_ns) /
1000;
entries_required /= wm->cacheline_size; entries_required /= wm->cacheline_size;
DRM_DEBUG("FIFO entries required for mode: %d\n", entries_required); DRM_DEBUG("FIFO entries required for mode: %d\n", entries_required);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment