Module Name: xsrc
Committed By: mrg
Date: Sun Dec 30 08:35:04 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_bo_helper.c
Log Message:
avoid using GBM_BO_USE_LINEAR if it isn't defined.
XXX: xorg-server 1.18 issue?
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.1.1.5 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.1.1.5 Sun Dec 30 07:33:48 2018
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c Sun Dec 30 08:35:04 2018
@@ -209,10 +209,12 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn
if (bitsPerPixel == pScrn->bitsPerPixel)
bo_use |= GBM_BO_USE_SCANOUT;
+#ifdef GBM_BO_USE_LINEAR
if ((usage_hint == CREATE_PIXMAP_USAGE_BACKING_PIXMAP &&
info->shadow_primary) ||
(usage_hint & 0xffff) == CREATE_PIXMAP_USAGE_SHARED)
bo_use |= GBM_BO_USE_LINEAR;
+#endif
bo->bo.gbm = gbm_bo_create(info->gbm, width, height, gbm_format, bo_use);
if (!bo->bo.gbm) {
