Speed-up video on fuloong.

	* grub-core/bus/bonito.c (grub_pci_device_map_range_cached):
	New function.
	(grub_pci_device_unmap_range): Handle non-cached address.
	* grub-core/video/sis315pro.c (framebuffer): Remove render_target and
	add direct_ptr.
	(grub_video_sis315pro_video_fini): Unmap direct_ptr.
	(grub_video_sis315pro_setup): Use cache address and grub_video_fb_setup.
	(grub_video_sis315pro_set_active_render_target): Removed.
	(grub_video_sis315pro_get_info_and_fini): Use uncached address.
	(grub_video_adapter): Use grub_video_fb_set_active_render_target.
	(grub_video_sis315pro_swap_buffers): Call grub_video_fb_swap_buffers and
	sync caches.
	* include/grub/mips/loongson/pci.h (grub_pci_device_map_range_cached):
	New proto.

diff --git a/ChangeLog b/ChangeLog
index ef24e646b4e81f471f97ebfaf170b5c3bf1650c8..df30009d2024e3b65e704d3d2363491db64370ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-06-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Speed-up video on fuloong.
+
+       * grub-core/bus/bonito.c (grub_pci_device_map_range_cached):
+       New function.
+       (grub_pci_device_unmap_range): Handle non-cached address.
+       * grub-core/video/sis315pro.c (framebuffer): Remove render_target and
+       add direct_ptr.
+       (grub_video_sis315pro_video_fini): Unmap direct_ptr.
+       (grub_video_sis315pro_setup): Use cache address and grub_video_fb_setup.
+       (grub_video_sis315pro_set_active_render_target): Removed.
+       (grub_video_sis315pro_get_info_and_fini): Use uncached address.
+       (grub_video_adapter): Use grub_video_fb_set_active_render_target.
+       (grub_video_sis315pro_swap_buffers): Call grub_video_fb_swap_buffers and
+       sync caches.
+       * include/grub/mips/loongson/pci.h (grub_pci_device_map_range_cached):
+       New proto.
+
 2012-06-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi (Multi-boot manual config): New section.

diff --git a/grub-core/bus/bonito.c b/grub-core/bus/bonito.c
index c2e0cd6ff1b82ffbe8f770f29c4aad78f9d61145..985608181f453fdc54a3fdade5e182709185b1d3 100644 (file)
--- a/grub-core/bus/bonito.c
+++ b/grub-core/bus/bonito.c
@@ -73,15 +73,24 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
   grub_fatal ("Out of PCI windows.");
 }
 
+void *
+grub_pci_device_map_range_cached (grub_pci_device_t dev,
+                                 grub_addr_t base, grub_size_t size)
+{
+  return (void *) (((grub_addr_t) grub_pci_device_map_range (dev, base, size))
+                  & ~0x20000000);
+}
+
 void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-                            volatile void *mem __attribute__ ((unused)),
+                            volatile void *mem,
                             grub_size_t size __attribute__ ((unused)))
 {
   int i;
   for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
     if (usage_win[i] && addr_win[i] 
-       == (((grub_addr_t) mem) & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
+       == (((grub_addr_t) mem | 0x20000000)
+           & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
       {
        usage_win[i]--;
        return;

diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c
index d18f73028edbfe1b4739d0ca0b768473e1bd6f6f..5d06daace748451954ba00a8018585afe6aab852 100644 (file)
--- a/grub-core/video/sis315pro.c
+++ b/grub-core/video/sis315pro.c
@@ -27,6 +27,7 @@
 #include <grub/video_fb.h>
 #include <grub/pci.h>
 #include <grub/vga.h>
+#include <grub/cache.h>
 
 #define GRUB_SIS315PRO_PCIID 0x03251039
 #define GRUB_SIS315PRO_TOTAL_MEMORY_SPACE  0x800000
@@ -35,9 +36,9 @@
 static struct
 {
   struct grub_video_mode_info mode_info;
-  struct grub_video_render_target *render_target;
 
   grub_uint8_t *ptr;
+  volatile grub_uint8_t *direct_ptr;
   int mapped;
   grub_uint32_t base;
   grub_uint32_t mmiobase;
@@ -74,8 +75,12 @@ static grub_err_t
 grub_video_sis315pro_video_fini (void)
 {
   if (framebuffer.mapped)
-    grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
-                                GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+    {
+      grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
+                                  GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+      grub_pci_device_unmap_range (framebuffer.dev, framebuffer.direct_ptr,
+                                  GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+    }
 
   return grub_video_fb_fini ();
 }
@@ -137,7 +142,9 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
   /* Fill mode info details.  */
   framebuffer.mode_info.width = 640;
   framebuffer.mode_info.height = 480;
-  framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+  framebuffer.mode_info.mode_type = (GRUB_VIDEO_MODE_TYPE_INDEX_COLOR
+                                    | GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+                                    | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
   framebuffer.mode_info.bpp = 8;
   framebuffer.mode_info.bytes_per_pixel = 1;
   framebuffer.mode_info.pitch = 640 * 1;
@@ -192,9 +199,13 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
   /* We can safely discard volatile attribute.  */
 #ifndef TEST
   framebuffer.ptr
-    = (void *) grub_pci_device_map_range (framebuffer.dev,
-                                         framebuffer.base,
-                                         GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+    = grub_pci_device_map_range_cached (framebuffer.dev,
+                                       framebuffer.base,
+                                       GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
+  framebuffer.direct_ptr
+    = grub_pci_device_map_range (framebuffer.dev,
+                                framebuffer.base,
+                                GRUB_SIS315PRO_TOTAL_MEMORY_SPACE);
   framebuffer.mmioptr = grub_pci_device_map_range (framebuffer.dev,
                                                   framebuffer.mmiobase,
                                                   GRUB_SIS315PRO_MMIO_SPACE);
@@ -205,6 +216,9 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
   /* Prevent garbage from appearing on the screen.  */
   grub_memset (framebuffer.ptr, 0, 
               framebuffer.mode_info.height * framebuffer.mode_info.pitch);
+  grub_arch_sync_dma_caches (framebuffer.ptr,
+                            framebuffer.mode_info.height
+                            * framebuffer.mode_info.pitch);
 #endif
 
   grub_outb (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY
@@ -347,16 +361,9 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
 #endif
 
 #ifndef TEST
-  err = grub_video_fb_create_render_target_from_pointer (&framebuffer
-                                                        .render_target,
-                                                        &framebuffer.mode_info,
-                                                        framebuffer.ptr);
-
-  if (err)
-    return err;
-
-  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
-  
+  err = grub_video_fb_setup (mode_type, mode_mask,
+                            &framebuffer.mode_info,
+                            framebuffer.ptr, NULL, NULL);
   if (err)
     return err;
 
@@ -372,25 +379,21 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
 static grub_err_t
 grub_video_sis315pro_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.ptr, s);
   return GRUB_ERR_NONE;
 }
 
-static grub_err_t
-grub_video_sis315pro_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
 grub_video_sis315pro_get_info_and_fini (struct grub_video_mode_info *mode_info,
                                        void **framebuf)
 {
   grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
-  *framebuf = (char *) framebuffer.ptr;
+  *framebuf = (void *) framebuffer.direct_ptr;
 
   grub_video_fb_fini ();
 
@@ -424,7 +427,7 @@ static struct grub_video_adapter grub_video_sis315pro_adapter =
     .swap_buffers = grub_video_sis315pro_swap_buffers,
     .create_render_target = grub_video_fb_create_render_target,
     .delete_render_target = grub_video_fb_delete_render_target,
-    .set_active_render_target = grub_video_sis315pro_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,
 
     .next = 0

diff --git a/include/grub/mips/loongson/pci.h b/include/grub/mips/loongson/pci.h
index 57c7dd1fce2a03f43aaa8d7baab05a8714054dcb..a81f7d75d829bd994d50203b64a34129a3ccb65c 100644 (file)
--- a/include/grub/mips/loongson/pci.h
+++ b/include/grub/mips/loongson/pci.h
@@ -110,6 +110,10 @@ grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
 volatile void *
 EXPORT_FUNC (grub_pci_device_map_range) (grub_pci_device_t dev,
                                         grub_addr_t base, grub_size_t size);
+void *
+EXPORT_FUNC (grub_pci_device_map_range_cached) (grub_pci_device_t dev,
+                                               grub_addr_t base,
+                                               grub_size_t size);
 void
 EXPORT_FUNC (grub_pci_device_unmap_range) (grub_pci_device_t dev,
                                           volatile void *mem,