vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Speed-up video on yeeloong.

Browse source 
* grub-core/video/sm712.c (framebuffer): Remove render_target and
	add cached_ptr.
	(grub_video_sm712_video_fini): Unmap cached_ptr.
	(grub_video_sm712_setup): Use cache address and grub_video_fb_setup.
	(grub_video_sm712_set_active_render_target): Removed.
	(grub_video_adapter): Use grub_video_fb_set_active_render_target.
	(grub_video_sm712_swap_buffers): Call grub_video_fb_swap_buffers and
	sync caches.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-22 23:47:34 +02:00
parent ed24c31201
commit 9e86d4c59a
2 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2012-06-22 Vladimir Serbinenko <phcoder@gmail.com>
Speed-up video on yeeloong.
* grub-core/video/sm712.c (framebuffer): Remove render_target and
add cached_ptr.
(grub_video_sm712_video_fini): Unmap cached_ptr.
(grub_video_sm712_setup): Use cache address and grub_video_fb_setup.
(grub_video_sm712_set_active_render_target): Removed.
(grub_video_adapter): Use grub_video_fb_set_active_render_target.
(grub_video_sm712_swap_buffers): Call grub_video_fb_swap_buffers and
sync caches.
2012-06-22 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-22 Vladimir Serbinenko <phcoder@gmail.com>
Avoid flushing the same line multiple times on loongson. Avoid flushing the same line multiple times on loongson.

61
grub-core/video/sm712.c
View file

@ -27,6 +27,7 @@
#include <grub/video_fb.h> #include <grub/video_fb.h>
#include <grub/pci.h> #include <grub/pci.h>
#include <grub/vga.h> #include <grub/vga.h>
#include <grub/cache.h>
#include "sm712_init.c" #include "sm712_init.c"
@ -194,9 +195,9 @@ static struct
static struct static struct
{ {
struct grub_video_mode_info mode_info; struct grub_video_mode_info mode_info;
struct grub_video_render_target *render_target;
grub_uint8_t *ptr; volatile grub_uint8_t *ptr;
grub_uint8_t *cached_ptr;
int mapped; int mapped;
grub_uint32_t base; grub_uint32_t base;
grub_pci_device_t dev; grub_pci_device_t dev;
@ -216,9 +217,12 @@ static grub_err_t
grub_video_sm712_video_fini (void) grub_video_sm712_video_fini (void)
{ {
if (framebuffer.mapped) if (framebuffer.mapped)
grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr, {
GRUB_SM712_TOTAL_MEMORY_SPACE); grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
GRUB_SM712_TOTAL_MEMORY_SPACE);
grub_pci_device_unmap_range (framebuffer.dev, framebuffer.cached_ptr,
GRUB_SM712_TOTAL_MEMORY_SPACE);
}
return grub_video_fb_fini (); return grub_video_fb_fini ();
} }
#endif #endif
@ -382,7 +386,9 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
/* Fill mode info details. */ /* Fill mode info details. */
framebuffer.mode_info.width = 1024; framebuffer.mode_info.width = 1024;
framebuffer.mode_info.height = 600; framebuffer.mode_info.height = 600;
framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_RGB; framebuffer.mode_info.mode_type = (GRUB_VIDEO_MODE_TYPE_RGB
| GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
| GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
framebuffer.mode_info.bpp = 16; framebuffer.mode_info.bpp = 16;
framebuffer.mode_info.bytes_per_pixel = 2; framebuffer.mode_info.bytes_per_pixel = 2;
framebuffer.mode_info.pitch = 1024 * 2; framebuffer.mode_info.pitch = 1024 * 2;
@ -423,9 +429,13 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
/* We can safely discard volatile attribute. */ /* We can safely discard volatile attribute. */
#ifndef TEST #ifndef TEST
framebuffer.ptr framebuffer.ptr
= (void *) grub_pci_device_map_range (framebuffer.dev, = grub_pci_device_map_range (framebuffer.dev,
framebuffer.base, framebuffer.base,
GRUB_SM712_TOTAL_MEMORY_SPACE); GRUB_SM712_TOTAL_MEMORY_SPACE);
framebuffer.cached_ptr
= grub_pci_device_map_range_cached (framebuffer.dev,
framebuffer.base,
GRUB_SM712_TOTAL_MEMORY_SPACE);
#endif #endif
framebuffer.mapped = 1; framebuffer.mapped = 1;
@ -437,7 +447,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
#ifndef TEST #ifndef TEST
/* Prevent garbage from appearing on the screen. */ /* Prevent garbage from appearing on the screen. */
grub_memset (framebuffer.ptr, 0, grub_memset ((void *) framebuffer.cached_ptr, 0,
framebuffer.mode_info.height * framebuffer.mode_info.pitch); framebuffer.mode_info.height * framebuffer.mode_info.pitch);
#endif #endif
@ -688,16 +698,9 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
(void) grub_sm712_sr_read (0x16); (void) grub_sm712_sr_read (0x16);
#ifndef TEST #ifndef TEST
err = grub_video_fb_create_render_target_from_pointer (&framebuffer err = grub_video_fb_setup (mode_type, mode_mask,
.render_target, &framebuffer.mode_info,
&framebuffer.mode_info, framebuffer.cached_ptr, NULL, NULL);
framebuffer.ptr);
if (err)
return err;
err = grub_video_fb_set_active_render_target (framebuffer.render_target);
if (err) if (err)
return err; return err;
@ -713,19 +716,15 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
static grub_err_t static grub_err_t
grub_video_sm712_swap_buffers (void) grub_video_sm712_swap_buffers (void)
{ {
/* TODO: Implement buffer swapping. */ grub_size_t s;
s = (framebuffer.mode_info.height
* framebuffer.mode_info.pitch
* framebuffer.mode_info.bytes_per_pixel);
grub_video_fb_swap_buffers ();
grub_arch_sync_dma_caches (framebuffer.cached_ptr, s);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static grub_err_t
grub_video_sm712_set_active_render_target (struct grub_video_render_target *target)
{
if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
target = framebuffer.render_target;
return grub_video_fb_set_active_render_target (target);
}
static grub_err_t static grub_err_t
grub_video_sm712_get_info_and_fini (struct grub_video_mode_info *mode_info, grub_video_sm712_get_info_and_fini (struct grub_video_mode_info *mode_info,
void **framebuf) void **framebuf)
@ -765,7 +764,7 @@ static struct grub_video_adapter grub_video_sm712_adapter =
.swap_buffers = grub_video_sm712_swap_buffers, .swap_buffers = grub_video_sm712_swap_buffers,
.create_render_target = grub_video_fb_create_render_target, .create_render_target = grub_video_fb_create_render_target,
.delete_render_target = grub_video_fb_delete_render_target, .delete_render_target = grub_video_fb_delete_render_target,
.set_active_render_target = grub_video_sm712_set_active_render_target, .set_active_render_target = grub_video_fb_set_active_render_target,
.get_active_render_target = grub_video_fb_get_active_render_target, .get_active_render_target = grub_video_fb_get_active_render_target,
.next = 0 .next = 0