summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-05-29 13:45:29 +0300
committerAlon Levy <alevy@redhat.com>2012-05-31 20:13:47 +0300
commit3dc64104904e41f94060df18a4ba73d6a07b90b4 (patch)
tree252ed617401901bc2dd95ba17f7636dacaa6615d
parent4ad003b73e76b8f825b1f13b416683d782372b5b (diff)
rename qxl_reset to qxl_reset_and_create_mem_slots
-rw-r--r--src/qxl_driver.c8
1 files 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