xf86-video-amdgpu: Branch 'master' - 2 commits
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon May 11 18:32:19 PDT 2015
src/amdgpu_bo_helper.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7e3b27390a03e423772717fca3c757cf5cc4d7b4
Author: Jammy Zhou <Jammy.Zhou at amd.com>
Date: Tue May 12 05:34:49 2015 +0800
Disable tiling for PRIME shared pixmap
Signed-off-by: Jammy Zhou <Jammy.Zhou at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/amdgpu_bo_helper.c b/src/amdgpu_bo_helper.c
index e041352..e4f30f1 100644
--- a/src/amdgpu_bo_helper.c
+++ b/src/amdgpu_bo_helper.c
@@ -77,7 +77,7 @@ struct amdgpu_buffer *amdgpu_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width,
#ifdef CREATE_PIXMAP_USAGE_SHARED
if (usage_hint == CREATE_PIXMAP_USAGE_SHARED) {
- /* XXX: Need to tell GBM to disable tiling in this case */
+ bo_use |= GBM_BO_USE_LINEAR;
}
#endif
commit 4840f918ab7d61b4f55bcdff3afdac7b34e45d88
Author: Jammy Zhou <Jammy.Zhou at amd.com>
Date: Tue May 12 00:09:42 2015 +0800
Use gbm_bo_get_fd to get DMA_BUF fd
When GBM is used for buffer allocation, gbm_bo_get_fd should be
used to get the DMA_BUF fd.
Signed-off-by: Jammy Zhou <Jammy.Zhou at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/amdgpu_bo_helper.c b/src/amdgpu_bo_helper.c
index fa87783..e041352 100644
--- a/src/amdgpu_bo_helper.c
+++ b/src/amdgpu_bo_helper.c
@@ -296,7 +296,11 @@ Bool amdgpu_share_pixmap_backing(struct amdgpu_buffer *bo, void **handle_p)
{
int handle;
- amdgpu_bo_export(bo->bo.amdgpu, amdgpu_bo_handle_type_dma_buf_fd,
+ if (bo->flags & AMDGPU_BO_FLAGS_GBM)
+ handle = gbm_bo_get_fd(bo->bo.gbm);
+ else
+ amdgpu_bo_export(bo->bo.amdgpu,
+ amdgpu_bo_handle_type_dma_buf_fd,
(uint32_t *)&handle);
*handle_p = (void *)(long)handle;
More information about the xorg-commit
mailing list