i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel_extreme: Fix swapping of p2 values for 9xx cards

Browse Source 
This would lead to no valid PLL combination being found, and
uninitialized stack memory eventually used to set the PLL. Add a memset
and a debugger() call to make this easier to notice.

Should fix #14368

Change-Id: Iff307439dc82a8b81bb46c1b73b63c21ee1c8279
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1898
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Adrien Destugues
2019-12-05 19:55:57 +00:00
committed by Adrien Destugues
parent af3d90a597
commit 74db79d587
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/intel_extreme/pll.cpp
+13 -8
View File
@@ -55,19 +55,19 @@ static pll_limits kLimits85x = {
// and carried on to later cards with just one further change (to the P2 cutoff
// frequency) in Sandy Bridge.
//
// So, it makes no sense to have separa limits and algorithm for 9xx and G45.
// So, it makes no sense to have separate limits and algorithm for 9xx and G45.
static pll_limits kLimits9xxSdvo = {
// p, p1, p2, n, m, m1, m2
{ 5, 1, 10, 5, 70, 12, 7}, // min
{ 80, 8, 5, 10, 120, 22, 11}, // max
{ 5, 1, 5, 5, 70, 12, 7}, // min
{ 80, 8, 10, 10, 120, 22, 11}, // max
200000, 1400000, 2800000
};
static pll_limits kLimits9xxLvds = {
// p, p1, p2, n, m, m1, m2
{ 7, 1, 14, 1, 70, 8, 3}, // min
{ 98, 8, 7, 6, 120, 18, 7}, // max
{ 7, 1, 7, 1, 70, 8, 3}, // min
{ 98, 8, 14, 6, 120, 18, 7}, // max
112000, 1400000, 2800000
};
@@ -406,6 +406,7 @@ compute_dpll_9xx(display_mode* current, pll_divisors* divisors, bool isLVDS)
float best = requestedPixelClock;
pll_divisors bestDivisors;
memset(&bestDivisors, 0, sizeof(bestDivisors));
for (divisors->m1 = limits.min.m1; divisors->m1 <= limits.max.m1;
divisors->m1++) {
@@ -438,9 +439,13 @@ compute_dpll_9xx(display_mode* current, pll_divisors* divisors, bool isLVDS)
*divisors = bestDivisors;
TRACE("%s: best MHz: %g (error: %g)\n", __func__,
((referenceClock * divisors->m) / divisors->n) / divisors->p,
best);
if (best == requestedPixelClock)
debugger("No valid PLL configuration found");
else {
TRACE("%s: best MHz: %g (error: %g)\n", __func__,
((referenceClock * divisors->m) / divisors->n) / divisors->p,
best);
}
}