andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prime: clean up slave bo properly. (v3)

Browse Source 
This is an ABI break, in that we now pass NULL to a function that hasn't
accepted it before.

Alex Goins had a different patch for this but it wasn't symmetrical, it
freed something in a very different place than it allocated it, this
attempts to retain symmetry in the releasing of the backing bo.

v2: use a new toplevel API, though it still passes NULL to something
that wasn't expecting it.
v3: pass -1 instead of 0.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alex Goins <agoins at nvidia.com>
This commit is contained in:
Dave Airlie 2016-05-06 10:46:14 +10:00 committed by Adam Jackson
parent aa5390aa83
commit a6b6e8ba02
6 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/pixmap.c
View File

@ -132,6 +132,13 @@ FreePixmap(PixmapPtr pPixmap)
free(pPixmap);
}
void PixmapUnshareSlavePixmap(PixmapPtr slave_pixmap)
{
int ihandle = -1;
ScreenPtr pScreen = slave_pixmap->drawable.pScreen;
pScreen->SetSharedPixmapBacking(slave_pixmap, ((void *)(long)ihandle));
}
PixmapPtr PixmapShareToSlave(PixmapPtr pixmap, ScreenPtr slave)
{
PixmapPtr spix;

1
hw/xfree86/dri2/dri2.c
View File

@ -859,6 +859,7 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
if (pPriv->prime_slave_pixmap->master_pixmap == mpix)
return &pPriv->prime_slave_pixmap->drawable;
else {
PixmapUnshareSlavePixmap(pPriv->prime_slave_pixmap);
(*pPriv->prime_slave_pixmap->master_pixmap->drawable.pScreen->DestroyPixmap)(pPriv->prime_slave_pixmap->master_pixmap);
(*slave->DestroyPixmap)(pPriv->prime_slave_pixmap);
pPriv->prime_slave_pixmap = NULL;

4
hw/xfree86/drivers/modesetting/driver.c
View File

@ -1074,6 +1074,10 @@ msSetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
Bool ret;
int ihandle = (int) (long) fd_handle;
if (ihandle == -1)
if (!ms->drmmode.reverse_prime_offload_mode)
return drmmode_SetSlaveBO(ppix, &ms->drmmode, ihandle, 0, 0);
if (ms->drmmode.reverse_prime_offload_mode) {
ret = glamor_back_pixmap_from_fd(ppix, ihandle,
ppix->drawable.width,

6
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -214,6 +214,12 @@ drmmode_SetSlaveBO(PixmapPtr ppix,
{
msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix);
if (fd_handle == -1) {
dumb_bo_destroy(drmmode->fd, ppriv->backing_bo);
ppriv->backing_bo = NULL;
return TRUE;
}
ppriv->backing_bo =
dumb_get_bo_from_fd(drmmode->fd, fd_handle, pitch, size);
if (!ppriv->backing_bo)

3
include/pixmap.h
View File

@ -115,6 +115,9 @@ extern _X_EXPORT void FreePixmap(PixmapPtr /*pPixmap */ );
extern _X_EXPORT PixmapPtr
PixmapShareToSlave(PixmapPtr pixmap, ScreenPtr slave);
extern _X_EXPORT void
PixmapUnshareSlavePixmap(PixmapPtr slave_pixmap);
#define HAS_DIRTYTRACKING_ROTATION 1
extern _X_EXPORT Bool
PixmapStartDirtyTracking(PixmapPtr src,

2
randr/rrcrtc.c
View File

@ -373,6 +373,8 @@ rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) {
* Unref the pixmap twice: once for the original reference, and once
* for the reference implicitly added by PixmapShareToSlave.
*/
PixmapUnshareSlavePixmap(pPixmap);
master->DestroyPixmap(pPixmap->master_pixmap);
master->DestroyPixmap(pPixmap->master_pixmap);
}