Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Keith Packard 2014-08-16 18:34:55 -07:00
parent 876185ccee
commit e3c06746c7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/uxa/intel_driver.c
View File

@ -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),

5
src/uxa/intel_uxa.c
View File

@ -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