andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modesetting: Fix build with glamor disabled 

Fixes: cb1b1e1847 "modesetting: Indirect the glamor API through
                     LoaderSymbol"
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Michel Dänzer 2020-02-10 18:41:44 +01:00 committed by Michel Dänzer
parent bfb36a5806
commit 0cb9fa7949
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xfree86/drivers/modesetting/driver.c
View File

@ -743,9 +743,17 @@ FreeRec(ScrnInfoPtr pScrn)
}
static void
bind_glamor_api(void *mod, modesettingPtr ms)
#ifdef GLAMOR_HAS_GBM
static Bool
load_glamor(ScrnInfoPtr pScrn)
{
void *mod = xf86LoadSubModule(pScrn, GLAMOR_EGL_MODULE_NAME);
modesettingPtr ms = modesettingPTR(pScrn);
if (!mod)
return FALSE;
ms->glamor.back_pixmap_from_fd = LoaderSymbolFromModule(mod, "glamor_back_pixmap_from_fd");
ms->glamor.block_handler = LoaderSymbolFromModule(mod, "glamor_block_handler");
ms->glamor.clear_pixmap = LoaderSymbolFromModule(mod, "glamor_clear_pixmap");
@ -763,8 +771,12 @@ bind_glamor_api(void *mod, modesettingPtr ms)
ms->glamor.supports_pixmap_import_export = LoaderSymbolFromModule(mod, "glamor_supports_pixmap_import_export");
ms->glamor.xv_init = LoaderSymbolFromModule(mod, "glamor_xv_init");
ms->glamor.egl_get_driver_name = LoaderSymbolFromModule(mod, "glamor_egl_get_driver_name");
return TRUE;
}
#endif
static void
try_enable_glamor(ScrnInfoPtr pScrn)
{
@ -773,7 +785,6 @@ try_enable_glamor(ScrnInfoPtr pScrn)
OPTION_ACCEL_METHOD);
Bool do_glamor = (!accel_method_str ||
strcmp(accel_method_str, "glamor") == 0);
void *mod;
ms->drmmode.glamor = FALSE;
@ -788,9 +799,7 @@ try_enable_glamor(ScrnInfoPtr pScrn)
return;
}
mod = xf86LoadSubModule(pScrn, GLAMOR_EGL_MODULE_NAME);
if (mod) {
bind_glamor_api(mod, ms);
if (load_glamor(pScrn)) {
if (ms->glamor.egl_init(pScrn, ms->fd)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "glamor initialized\n");
ms->drmmode.glamor = TRUE;

3
hw/xfree86/drivers/modesetting/driver.h
View File

@ -132,6 +132,7 @@ typedef struct _modesettingRec {
void (*UpdatePacked)(ScreenPtr, shadowBufPtr);
} shadow;
#ifdef GLAMOR_HAS_GBM
/* glamor API */
struct {
Bool (*back_pixmap_from_fd)(PixmapPtr, int, CARD16, CARD16, CARD16,
@ -157,7 +158,7 @@ typedef struct _modesettingRec {
XF86VideoAdaptorPtr (*xv_init)(ScreenPtr, int);
const char *(*egl_get_driver_name)(ScreenPtr);
} glamor;
#endif
} modesettingRec, *modesettingPtr;
#define glamor_finish(screen) ms->glamor.finish(screen)