diff options
| author | Antonino Daplas <adaplas@hotpop.com> | 2005-03-30 16:43:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-30 16:43:05 -0800 |
| commit | 46563c7ae61c27154ee8557176669a75b21179a4 (patch) | |
| tree | 4c9fdd02b2f58b9678389625851acf5b5819ec0b | |
| parent | 2859de99c8a8f32ee7287d2c01e268b7e64bdd2a (diff) | |
| download | history-46563c7ae61c27154ee8557176669a75b21179a4.tar.gz | |
[PATCH] nvidiafb: Maximize blit buffer capacity
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/nvidia/nv_accel.c | 20 | ||||
| -rw-r--r-- | drivers/video/nvidia/nv_local.h | 3 |
2 files changed, 18 insertions, 5 deletions
diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c index cbb24c98b26009..f377a29ec97a6c 100644 --- a/drivers/video/nvidia/nv_accel.c +++ b/drivers/video/nvidia/nv_accel.c @@ -359,10 +359,10 @@ static void nvidiafb_mono_color_expand(struct fb_info *info, 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(struct fb_info *info, 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 --git a/drivers/video/nvidia/nv_local.h b/drivers/video/nvidia/nv_local.h index e79f5cc034ecc8..9da320986f4c92 100644 --- a/drivers/video/nvidia/nv_local.h +++ b/drivers/video/nvidia/nv_local.h @@ -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(); \ } |