diff options
author | Alon Levy <alevy@redhat.com> | 2012-05-23 21:23:09 +0300 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2012-06-27 14:41:30 +0300 |
commit | e899d3c4af6a8181c7b114fe2b25c7b4a393db01 (patch) | |
tree | 7f4e002a3f61c15264922a71c4206563943572cc | |
parent | a22751ddf654af9973a812c89b66ccbada9acb00 (diff) |
qxl_screen_init: move uxa_resources_init down to after qxl_switch_mode has run
-rw-r--r-- | src/qxl_driver.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/qxl_driver.c b/src/qxl_driver.c index 284ffa1..d0731b1 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -1209,13 +1209,6 @@ qxl_screen_init(SCREEN_INIT_ARGS_DECL) if (!miCreateDefColormap(pScreen)) goto out; - /* Note: this must be done after DamageSetup() because it calls - * _dixInitPrivates. And if that has been called, DamageSetup() - * will assert. - */ - if (!uxa_resources_init (pScreen)) - return FALSE; - qxl->create_screen_resources = pScreen->CreateScreenResources; pScreen->CreateScreenResources = qxl_create_screen_resources; @@ -1231,6 +1224,12 @@ qxl_screen_init(SCREEN_INIT_ARGS_DECL) qxl_switch_mode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); + /* Note: this must be done after DamageSetup() because it calls + * _dixInitPrivates. And if that has been called, DamageSetup() + * will assert. + */ + if (!uxa_resources_init (pScreen)) + return FALSE; CHECK_POINT(); return TRUE; |