xf86-video-amdgpu: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Sun May 17 20:30:13 PDT 2015
src/amdgpu_bo_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e75e9f39c95b8b563885882bf29d776861cd6ca3
Author: Brian Paterni <bpaterni at gmail.com>
Date: Sat May 16 15:00:14 2015 -0500
extend conditional group GBM_BO_USE_LINEAR
over both usages
Fixes 'GBM_BO_USE_LINEAR' undeclared error when compiling against older
libgbm
Signed-off-by: Brian Paterni <bpaterni at gmail.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 e4f30f1..1de2a0a 100644
--- a/src/amdgpu_bo_helper.c
+++ b/src/amdgpu_bo_helper.c
@@ -75,13 +75,13 @@ struct amdgpu_buffer *amdgpu_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width,
if ( bitsPerPixel == pScrn->bitsPerPixel)
bo_use |= GBM_BO_USE_SCANOUT;
+#ifdef GBM_BO_USE_LINEAR
#ifdef CREATE_PIXMAP_USAGE_SHARED
if (usage_hint == CREATE_PIXMAP_USAGE_SHARED) {
bo_use |= GBM_BO_USE_LINEAR;
}
#endif
-#ifdef GBM_BO_USE_LINEAR
if (usage_hint & AMDGPU_CREATE_PIXMAP_LINEAR) {
bo_use |= GBM_BO_USE_LINEAR;
}
More information about the xorg-commit
mailing list