From: "Antonino A. Daplas" <adaplas@hotpop.com>
Currently, nvidiafb blit expands a rectangle a scanline at a time. This is
very inefficient because the graphics pipeline is not maximized. It may also
crash if the scanline is > 4096 (should not happen with fbcon though).
Instead of blitting a scanline at a time, attempt to fill up buffer to maximum
capacity.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/video/nvidia/nv_accel.c | 20 +++++++++++++++++---
25-akpm/drivers/video/nvidia/nv_local.h | 3 +--
2 files changed, 18 insertions(+), 5 deletions(-)
diff -puN drivers/video/nvidia/nv_accel.c~nvidiafb-maximize-blit-buffer-capacity drivers/video/nvidia/nv_accel.c
--- 25/drivers/video/nvidia/nv_accel.c~nvidiafb-maximize-blit-buffer-capacity 2005-03-13 13:33:49.000000000 -0800
+++ 25-akpm/drivers/video/nvidia/nv_accel.c 2005-03-13 13:33:49.000000000 -0800
@@ -359,10 +359,10 @@ static void nvidiafb_mono_color_expand(s
struct nvidia_par *par = info->par;
u32 fg, bg, mask = ~(~0 >> (32 - info->var.bits_per_pixel));
u32 dsize, width, *data = (u32 *) image->data, tmp;
- int i, j, k = 0;
+ int j, k = 0;
width = (image->width + 31) & ~31;
- dsize = width >> 5;
+ dsize = (width * image->height) >> 5;
if (info->var.bits_per_pixel == 8) {
fg = image->fg_color | mask;
@@ -382,8 +382,22 @@ static void nvidiafb_mono_color_expand(s
NVDmaNext(par, (image->height << 16) | width);
NVDmaNext(par, (image->dy << 16) | (image->dx & 0xffff));
- for (i = image->height; i--;) {
+ while (dsize >= RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS) {
+ NVDmaStart(par, RECT_EXPAND_TWO_COLOR_DATA(0),
+ RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS);
+
+ for (j = RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS; j--;) {
+ tmp = data[k++];
+ reverse_order(&tmp);
+ NVDmaNext(par, tmp);
+ }
+
+ dsize -= RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS;
+ }
+
+ if (dsize) {
NVDmaStart(par, RECT_EXPAND_TWO_COLOR_DATA(0), dsize);
+
for (j = dsize; j--;) {
tmp = data[k++];
reverse_order(&tmp);
diff -puN drivers/video/nvidia/nv_local.h~nvidiafb-maximize-blit-buffer-capacity drivers/video/nvidia/nv_local.h
--- 25/drivers/video/nvidia/nv_local.h~nvidiafb-maximize-blit-buffer-capacity 2005-03-13 13:33:49.000000000 -0800
+++ 25-akpm/drivers/video/nvidia/nv_local.h 2005-03-13 13:33:49.000000000 -0800
@@ -87,9 +87,8 @@
#endif
#define WRITE_PUT(par, data) { \
- volatile u8 scratch; \
_NV_FENCE() \
- scratch = NV_RD08((par)->FbStart, 0); \
+ NV_RD08((par)->FbStart, 0); \
NV_WR32(&(par)->FIFO[0x0010], 0, (data) << 2); \
mb(); \
}
_