diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-09-12 18:54:33 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-09-21 16:25:25 +0900 |
| commit | 8523a733b6a5de6116a6332fefc871d4c32652d8 (patch) | |
| tree | da2201680ea4e4772c84760cdd7df281ddb97064 /src/radeon_bo_helper.c | |
| parent | 53be26b00e83f871f0afd39caa5a7a1d6ec4aea1 (diff) | |
Propagate failure from radeon_set_pixmap_bo
(Ported from amdgpu commits c315c00e44afc91a7c8e2eab5af836d9643ebb88
and 0d42082108c264568e2aadd15ace70e72388bc65)
Diffstat (limited to 'src/radeon_bo_helper.c')
| -rw-r--r-- | src/radeon_bo_helper.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/radeon_bo_helper.c b/src/radeon_bo_helper.c index 531bc450..933dc7b3 100644 --- a/src/radeon_bo_helper.c +++ b/src/radeon_bo_helper.c @@ -312,14 +312,17 @@ Bool radeon_set_shared_pixmap_backing(PixmapPtr ppix, void *fd_handle, struct radeon_bo *bo; int ihandle = (int)(long)fd_handle; uint32_t size = ppix->devKind * ppix->drawable.height; + Bool ret = FALSE; bo = radeon_gem_bo_open_prime(info->bufmgr, ihandle, size); if (!bo) - return FALSE; + goto error; memset(surface, 0, sizeof(struct radeon_surface)); - radeon_set_pixmap_bo(ppix, bo); + ret = radeon_set_pixmap_bo(ppix, bo); + if (!ret) + goto error; if (info->ChipFamily >= CHIP_FAMILY_R600 && info->surf_man) { uint32_t tiling_flags; @@ -360,10 +363,12 @@ Bool radeon_set_shared_pixmap_backing(PixmapPtr ppix, void *fd_handle, surface->stencil_tile_split = (tiling_flags >> RADEON_TILING_EG_STENCIL_TILE_SPLIT_SHIFT) & RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK; surface->mtilea = (tiling_flags >> RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT) & RADEON_TILING_EG_MACRO_TILE_ASPECT_MASK; if (radeon_surface_best(info->surf_man, surface)) { - return FALSE; + ret = FALSE; + goto error; } if (radeon_surface_init(info->surf_man, surface)) { - return FALSE; + ret = FALSE; + goto error; } /* we have to post hack the surface to reflect the actual size of the shared pixmap */ @@ -371,11 +376,12 @@ Bool radeon_set_shared_pixmap_backing(PixmapPtr ppix, void *fd_handle, surface->level[0].nblk_x = ppix->devKind / surface->bpe; } + error: close(ihandle); /* we have a reference from the alloc and one from set pixmap bo, drop one */ radeon_bo_unref(bo); - return TRUE; + return ret; } #endif /* RADEON_PIXMAP_SHARING */ |