Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,16 @@ else
fi
AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)

AC_CHECK_DECL(GBM_BO_USE_LINEAR,
[AC_DEFINE(HAVE_GBM_BO_USE_LINEAR, 1, [Have GBM_BO_USE_LINEAR])], [],
[#include <stdlib.h>
#include <gbm.h>])

AC_CHECK_DECL(GBM_BO_USE_FRONT_RENDERING,
[AC_DEFINE(HAVE_GBM_BO_USE_FRONT_RENDERING, 1, [Have GBM_BO_USE_FRONT_RENDERING])], [],
[#include <stdlib.h>
#include <gbm.h>])

CPPFLAGS="$SAVE_CPPFLAGS"

# Checks for headers/macros for byte swapping
Expand Down
4 changes: 4 additions & 0 deletions src/amdgpu_bo_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,17 @@ struct amdgpu_buffer *amdgpu_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width,
if (usage_hint & AMDGPU_CREATE_PIXMAP_SCANOUT)
bo_use |= GBM_BO_USE_SCANOUT;

#ifdef HAVE_GBM_BO_USE_FRONT_RENDERING
if (usage_hint & AMDGPU_CREATE_PIXMAP_FRONT)
bo_use |= GBM_BO_USE_FRONT_RENDERING;
#endif

#ifdef HAVE_GBM_BO_USE_LINEAR
if (usage_hint == CREATE_PIXMAP_USAGE_SHARED ||
(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,
Expand Down
2 changes: 2 additions & 0 deletions src/amdgpu_kms.c
Original file line number Diff line number Diff line change
Expand Up @@ -1316,11 +1316,13 @@ static Bool AMDGPUPreInitAccel_KMS(ScrnInfoPtr pScrn)
if (xf86ReturnOptValBool(info->Options, OPTION_ACCEL, TRUE)) {
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn);
Bool use_glamor = TRUE;
#ifdef HAVE_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");
Expand Down