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

sna: Clear structures across server reset 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-08-25 14:49:30 +01:00
parent 0865acb3ad
commit bd98001a49
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sna/kgem.c
View File

@ -310,9 +310,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, int gen)
struct drm_i915_gem_get_aperture aperture;
int i;
/* We presume we are partt of a zeroed structure
memset(kgem, 0, sizeof(*kgem));
*/
kgem->fd = fd;
kgem->gen = gen;

10
src/sna/sna_driver.c
View File

@ -745,11 +745,7 @@ static Bool sna_close_screen(int scrnIndex, ScreenPtr screen)
xf86_cursors_fini(screen);
/* XXX unhook devPrivate otherwise fbCloseScreen frees it! */
if (sna->front) {
screen->DestroyPixmap(sna->front);
sna->front = NULL;
screen->devPrivate = NULL;
}
screen->devPrivate = NULL;
screen->CloseScreen = sna->CloseScreen;
(*screen->CloseScreen) (scrnIndex, screen);
@ -760,6 +756,10 @@ static Bool sna_close_screen(int scrnIndex, ScreenPtr screen)
}
sna_mode_remove_fb(sna);
if (sna->front) {
screen->DestroyPixmap(sna->front);
sna->front = NULL;
}
xf86GARTCloseScreen(scrnIndex);
scrn->vtSema = FALSE;

2
src/sna/sna_render.c
View File

@ -200,6 +200,8 @@ void no_render_init(struct sna *sna)
{
struct sna_render *render = &sna->render;
memset (render,0, sizeof (*render));
render->composite = no_render_composite;
render->copy_boxes = no_render_copy_boxes;