|
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> on behalf of Michel Dänzer <michel@xxxxxxxxxxx>
Sent: Thursday, October 18, 2018 4:13:58 AM To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx Subject: [PATCH xf86-video-ati] dri3: Handle radeon_get_pixmap_bo returning NULL From: Michel Dänzer <michel.daenzer@xxxxxxx>
We were trying to already, but testing the wrong pointer. Fixes: b85b7b11f5b5 "Add struct radeon_buffer" Bug: https://bugs.debian.org/910846 Signed-off-by: Michel Dänzer <michel.daenzer@xxxxxxx> --- src/radeon_dri3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c index 7e89a2f0b..25078bae1 100644 --- a/src/radeon_dri3.c +++ b/src/radeon_dri3.c @@ -212,7 +212,7 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen, CARD16 *stride, CARD32 *size) { - struct radeon_bo *bo; + struct radeon_buffer *bo; int fd; #ifdef USE_GLAMOR ScrnInfoPtr scrn = xf86ScreenToScrn(screen); @@ -222,10 +222,10 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen, return glamor_fd_from_pixmap(screen, pixmap, stride, size); #endif - bo = radeon_get_pixmap_bo(pixmap)->bo.radeon; + bo = radeon_get_pixmap_bo(pixmap); if (!bo) { exaMoveInPixmap(pixmap); - bo = radeon_get_pixmap_bo(pixmap)->bo.radeon; + bo = radeon_get_pixmap_bo(pixmap); if (!bo) return -1; } @@ -233,11 +233,11 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen, if (pixmap->devKind > UINT16_MAX) return -1; - if (radeon_gem_prime_share_bo(bo, &fd) < 0) + if (radeon_gem_prime_share_bo(bo->bo.radeon, &fd) < 0) return -1; *stride = pixmap->devKind; - *size = bo->size; + *size = bo->bo.radeon->size; return fd; } -- 2.19.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx |
_______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
