XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-03-24 01:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build when gbm.h doesn't define GBM_BO_USE_LINEAR

Browse Source 
Option "AccelMethod" "none" is ignored in that case.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2015-04-24 09:52:04 +09:00
parent 84df3e7114
commit fe4a4b6836
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amdgpu_bo_helper.c
View File

@@ -81,9 +81,11 @@ struct amdgpu_buffer *amdgpu_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width,
}
#endif
#ifdef GBM_BO_USE_LINEAR
if (usage_hint & AMDGPU_CREATE_PIXMAP_LINEAR) {
bo_use |= GBM_BO_USE_LINEAR;
}
#endif
pixmap_buffer->bo.gbm = gbm_bo_create(info->gbm, width, height,
gbm_format,

4
src/amdgpu_kms.c
View File

@@ -332,16 +332,18 @@ static Bool AMDGPUPreInitWeight(ScrnInfoPtr pScrn)
static Bool AMDGPUPreInitAccel_KMS(ScrnInfoPtr pScrn)
{
AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
const char *accel_method;
if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL,
info->ChipFamily == CHIP_FAMILY_HAWAII) &&
AMDGPUIsAccelWorking(pScrn)) {
Bool use_glamor = TRUE;
#ifdef GBM_BO_USE_LINEAR
const char *accel_method;
accel_method = xf86GetOptValString(info->Options, OPTION_ACCEL_METHOD);
if ((accel_method && !strcmp(accel_method, "none")))
use_glamor = FALSE;
#endif
#ifdef DRI2
info->dri2.available = ! !xf86LoadSubModule(pScrn, "dri2");