diff options
author | Keith Packard <keithp@keithp.com> | 2014-08-16 18:34:55 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-09-12 13:51:16 -0700 |
commit | e3c06746c7c22dcc2a862859c6f45dd1dfecdca7 (patch) | |
tree | 54107d9588e635b496552d950ba672c736705afc | |
parent | 876185cceeb9589ae395e0c2eedd163129f1e51b (diff) |
Move UXA hardware initialization into intel_uxa_init
Pull this uxa-specific step out of I830ScreenInit
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | src/uxa/intel_driver.c | 5 | ||||
-rw-r--r-- | src/uxa/intel_uxa.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index 30bfd7b1..9198e8ad 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -874,11 +874,6 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL) if (!intel_init_initial_framebuffer(scrn)) return FALSE; - intel_batch_init(scrn); - - if (INTEL_INFO(intel)->gen >= 040 && INTEL_INFO(intel)->gen < 0100) - gen4_render_state_init(scrn); - miClearVisualTypes(); if (!miSetVisualTypes(scrn->depth, miGetDefaultVisualMask(scrn->depth), diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c index 09358f3b..9ef3b1b5 100644 --- a/src/uxa/intel_uxa.c +++ b/src/uxa/intel_uxa.c @@ -1326,6 +1326,11 @@ Bool intel_uxa_init(ScreenPtr screen) ScrnInfoPtr scrn = xf86ScreenToScrn(screen); intel_screen_private *intel = intel_get_screen_private(scrn); + intel_batch_init(scrn); + + if (INTEL_INFO(intel)->gen >= 040 && INTEL_INFO(intel)->gen < 0100) + gen4_render_state_init(scrn); + #if HAS_DIXREGISTERPRIVATEKEY if (!dixRegisterPrivateKey(&uxa_pixmap_index, PRIVATE_PIXMAP, 0)) #else |