Commit a7f758e3 authored by Antonino Daplas's avatar Antonino Daplas Committed by Linus Torvalds

[PATCH] rivafb: fix broken burst length calculation

As noted by Linus, the burst-length "log2()" calculations were broken by
the cleanup.

This reverts to the old code.
parent 022afcaf
...@@ -641,10 +641,8 @@ static void nv3UpdateArbitrationSettings ...@@ -641,10 +641,8 @@ static void nv3UpdateArbitrationSettings
{ {
int b = fifo_data.graphics_burst_size >> 4; int b = fifo_data.graphics_burst_size >> 4;
*burst = 0; *burst = 0;
while (b) { while (b >>= 1)
(*burst)++; (*burst)++;
b >>= 1;
}
*lwm = fifo_data.graphics_lwm >> 3; *lwm = fifo_data.graphics_lwm >> 3;
} }
else else
...@@ -834,10 +832,8 @@ static void nv4UpdateArbitrationSettings ...@@ -834,10 +832,8 @@ static void nv4UpdateArbitrationSettings
{ {
int b = fifo_data.graphics_burst_size >> 4; int b = fifo_data.graphics_burst_size >> 4;
*burst = 0; *burst = 0;
while (b) { while (b >>= 1)
(*burst)++; (*burst)++;
b >>= 1;
}
*lwm = fifo_data.graphics_lwm >> 3; *lwm = fifo_data.graphics_lwm >> 3;
} }
} }
...@@ -1101,10 +1097,8 @@ static void nv10UpdateArbitrationSettings ...@@ -1101,10 +1097,8 @@ static void nv10UpdateArbitrationSettings
{ {
int b = fifo_data.graphics_burst_size >> 4; int b = fifo_data.graphics_burst_size >> 4;
*burst = 0; *burst = 0;
while (b) { while (b >>= 1)
(*burst)++; (*burst)++;
b >>= 1;
}
*lwm = fifo_data.graphics_lwm >> 3; *lwm = fifo_data.graphics_lwm >> 3;
} }
} }
...@@ -1155,10 +1149,8 @@ static void nForceUpdateArbitrationSettings ...@@ -1155,10 +1149,8 @@ static void nForceUpdateArbitrationSettings
{ {
int b = fifo_data.graphics_burst_size >> 4; int b = fifo_data.graphics_burst_size >> 4;
*burst = 0; *burst = 0;
while (b) { while (b >>= 1)
(*burst)++; (*burst)++;
b >>= 1;
}
*lwm = fifo_data.graphics_lwm >> 3; *lwm = fifo_data.graphics_lwm >> 3;
} }
} }
......
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