[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg-devel
Subject:    [PATCH 07/19] rename qxl_reset to qxl_reset_and_create_mem_slots
From:       Alon Levy <alevy () redhat ! com>
Date:       2012-05-31 10:24:41
Message-ID: 1338459893-1980-8-git-send-email-alevy () redhat ! com
[Download RAW message or body]

---
 src/qxl_driver.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 4c08637..c128231 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -525,7 +525,7 @@ setup_slot(qxl_screen_t *qxl, uint8_t slot_index_offset,
 }
 
 static void
-qxl_reset (qxl_screen_t *qxl)
+qxl_reset_and_create_mem_slots (qxl_screen_t *qxl)
 {
     ioport_write(qxl, QXL_IO_RESET, 0);
     /* Mem slots */
@@ -583,7 +583,7 @@ qxl_close_screen(int scrnIndex, ScreenPtr pScreen)
 
 #ifndef XSPICE
     if (!xf86IsPrimaryPci (qxl->pci) && qxl->primary)
-       qxl_reset (qxl);
+       qxl_reset_and_create_mem_slots (qxl);
 #endif
     
     if (pScrn->vtSema)
@@ -638,7 +638,7 @@ qxl_switch_mode(int scrnIndex, DisplayModePtr p, int flags)
 	qxl_surface_cache_sanity_check (qxl->surface_cache);
     }
 	
-    qxl_reset (qxl);
+    qxl_reset_and_create_mem_slots (qxl);
     
     ErrorF ("done reset\n");
 
@@ -1119,7 +1119,7 @@ qxl_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     qxl->uxa = uxa_driver_alloc ();
     
     /* Set up resources */
-    qxl_reset (qxl);
+    qxl_reset_and_create_mem_slots (qxl);
     ErrorF ("done reset\n");
 
 #ifndef XSPICE
-- 
1.7.10.1

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[prev in list] [next in list] [prev in thread] [next in thread]