frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EXA: Finish access to pixmap if it's prepared at destruction time. 

Previously we assumed every pixmap destroyed during a software fallback was
also created during a software fallback and had access prepared, but that's
not always true.

Fixes a server abort
Reported-by: 邓逸昕 <bupt.dengyixin@gmail.com>

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2010-07-13 14:56:53 +02:00 committed by Keith Packard
parent d75e8146c4
commit 0540c46066
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
exa/exa.c
View File

@ -435,6 +435,29 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
(*pExaScr->info->FinishAccess) (pPixmap, i); (*pExaScr->info->FinishAccess) (pPixmap, i);
} }
/**
* Helper for things common to all schemes when a pixmap is destroyed
*/
void
exaDestroyPixmap(PixmapPtr pPixmap)
{
ExaScreenPriv(pPixmap->drawable.pScreen);
int i;
/* Finish access if it was prepared (e.g. pixmap created during
* software fallback)
*/
for (i = 0; i < EXA_NUM_PREPARE_INDICES; i++) {
if (pExaScr->access[i].pixmap == pPixmap) {
exaFinishAccess(&pPixmap->drawable, i);
pExaScr->access[i].pixmap = NULL;
break;
}
}
}
/** /**
* Here begins EXA's GC code. * Here begins EXA's GC code.
* Do not ever access the fb/mi layer directly. * Do not ever access the fb/mi layer directly.

4
exa/exa_classic.c
View File

@ -221,9 +221,7 @@ exaDestroyPixmap_classic (PixmapPtr pPixmap)
{ {
ExaPixmapPriv (pPixmap); ExaPixmapPriv (pPixmap);
/* During a fallback we must finish access, but we don't know the index. */ exaDestroyPixmap(pPixmap);
if (pExaScr->fallback_counter)
exaFinishAccess(&pPixmap->drawable, -1);
if (pExaPixmap->area) if (pExaPixmap->area)
{ {

4
exa/exa_driver.c
View File

@ -193,9 +193,7 @@ exaDestroyPixmap_driver (PixmapPtr pPixmap)
{ {
ExaPixmapPriv (pPixmap); ExaPixmapPriv (pPixmap);
/* During a fallback we must finish access, but we don't know the index. */ exaDestroyPixmap(pPixmap);
if (pExaScr->fallback_counter)
exaFinishAccess(&pPixmap->drawable, -1);
if (pExaPixmap->driverPriv) if (pExaPixmap->driverPriv)
pExaScr->info->DestroyPixmap(pScreen, pExaPixmap->driverPriv); pExaScr->info->DestroyPixmap(pScreen, pExaPixmap->driverPriv);

4
exa/exa_mixed.c
View File

@ -245,9 +245,7 @@ exaDestroyPixmap_mixed(PixmapPtr pPixmap)
{ {
ExaPixmapPriv (pPixmap); ExaPixmapPriv (pPixmap);
/* During a fallback we must finish access, but we don't know the index. */ exaDestroyPixmap(pPixmap);
if (pExaScr->fallback_counter)
exaFinishAccess(&pPixmap->drawable, -1);
if (pExaScr->deferred_mixed_pixmap == pPixmap) if (pExaScr->deferred_mixed_pixmap == pPixmap)
pExaScr->deferred_mixed_pixmap = NULL; pExaScr->deferred_mixed_pixmap = NULL;

3
exa/exa_priv.h
View File

@ -550,6 +550,9 @@ exaPrepareAccess(DrawablePtr pDrawable, int index);
void void
exaFinishAccess(DrawablePtr pDrawable, int index); exaFinishAccess(DrawablePtr pDrawable, int index);
void
exaDestroyPixmap(PixmapPtr pPixmap);
void void
exaPixmapDirty(PixmapPtr pPix, int x1, int y1, int x2, int y2); exaPixmapDirty(PixmapPtr pPix, int x1, int y1, int x2, int y2);