summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-06-25 17:08:11 +0300
committerMarc-André Lureau <marcandre.lureau@gmail.com>2012-07-15 19:12:07 +0200
commit6dedd9a3f997c0112e71cfd0b28465348dfbbc36 (patch)
tree73420f1c8770591c7496a12998234e7105bbd4a8 /src
parentf838df1589c63fba8e99200238cf0b4e3acac6b1 (diff)
qxl_driver: move mspace_set_*_func earlier
Diffstat (limited to 'src')
-rw-r--r--src/qxl_driver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 90619e6..3cf3137 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -503,8 +503,7 @@ qxl_map_memory(qxl_screen_t *qxl, int scrnIndex)
qxl->rom->num_pages * getpagesize() - qxl->surface0_size);
qxl->surf_mem = qxl_mem_create ((void *)((unsigned long)qxl->vram), qxl->vram_size);
- mspace_set_abort_func(qxl_mspace_abort_func);
- mspace_set_print_func(qxl_mspace_print_func);
+ qxl_allocate_monitors_config(qxl);
return TRUE;
}
@@ -1484,6 +1483,9 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags)
CHECK_POINT();
+ mspace_set_abort_func(qxl_mspace_abort_func);
+ mspace_set_print_func(qxl_mspace_print_func);
+
/* zaphod mode is for suckers and i choose not to implement it */
if (xf86IsEntityShared(pScrn->entityList[0])) {
xf86DrvMsg(scrnIndex, X_ERROR, "No Zaphod mode for you\n");