Skip to content

amdgpu glamor: fix module loading when linked with '-z now' #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cepelinas9000 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

amdgpu glamor: fix module loading when linked with '-z now' #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/amdgpu_bo_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ Bool amdgpu_pixmap_get_handle(PixmapPtr pixmap, uint32_t *handle)
CARD32 size;
int fd, r;

fd = glamor_fd_from_pixmap(screen, pixmap, &stride, &size);
fd = info->glamor_abi.fd_from_pixmap(screen, pixmap, &stride, &size);
if (fd < 0)
return FALSE;

Expand Down
15 changes: 8 additions & 7 deletions src/amdgpu_dri3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,11 @@ static PixmapPtr amdgpu_dri3_pixmap_from_fd(ScreenPtr screen,
CARD8 bpp)
{
PixmapPtr pixmap;
AMDGPUInfoPtr info = AMDGPUPTR(xf86ScreenToScrn(screen));

/* Avoid generating a GEM flink name if possible */
if (AMDGPUPTR(xf86ScreenToScrn(screen))->use_glamor) {
pixmap = glamor_pixmap_from_fd(screen, fd, width, height,
if (info->use_glamor) {
pixmap = info->glamor_abi.pixmap_from_fd(screen, fd, width, height,
stride, depth, bpp);
if (pixmap) {
struct amdgpu_pixmap *priv = calloc(1, sizeof(*priv));
Expand Down Expand Up @@ -564,8 +565,8 @@ static PixmapPtr amdgpu_dri3_pixmap_from_fds(ScreenPtr screen,
if (!info->use_glamor)
goto non_glamor_path;

/* glamor path: use GBM to import multi-plane buffers */
gbm = glamor_egl_get_gbm_device(screen);
/* glamor path: use GBM to import multi-plane buffers */
gbm = info->glamor_abi.egl_get_gbm_device(screen);
if (!gbm)
goto non_glamor_path;

Expand Down Expand Up @@ -615,7 +616,7 @@ static PixmapPtr amdgpu_dri3_pixmap_from_fds(ScreenPtr screen,

if (bo) {
screen->ModifyPixmapHeader(pixmap, width, height, 0, 0, strides[0], NULL);
ret = glamor_egl_create_textured_pixmap_from_gbm_bo(pixmap, bo, FALSE);
ret = info->glamor_abi.egl_create_textured_pixmap_from_gbm_bo(pixmap, bo, FALSE);
gbm_bo_destroy(bo);
if (ret) {
struct amdgpu_pixmap *priv = calloc(1, sizeof(*priv));
Expand Down Expand Up @@ -684,7 +685,7 @@ static int amdgpu_dri3_fd_from_pixmap(ScreenPtr screen,
AMDGPUInfoPtr info = AMDGPUPTR(scrn);

if (info->use_glamor) {
int ret = glamor_fd_from_pixmap(screen, pixmap, stride, size);
int ret = info->glamor_abi.fd_from_pixmap(screen, pixmap, stride, size);

/* Any pending drawing operations need to be flushed to the
* kernel driver before the client starts using the pixmap
Expand Down Expand Up @@ -734,7 +735,7 @@ static int amdgpu_dri3_fds_from_pixmap(ScreenPtr screen,
CARD32 size;
int ret;

ret = glamor_fd_from_pixmap(screen, pixmap, &stride16, &size);
ret = info->glamor_abi.fd_from_pixmap(screen, pixmap, &stride16, &size);
if (ret < 0)
return -1;

Expand Down
51 changes: 51 additions & 0 deletions src/amdgpu_drv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
#include "drmmode_display.h"
#include "amdgpu_bo_helper.h"

#include "glamor.h"
#include "shadow.h"

struct _SyncFence;

#ifndef MAX
Expand Down Expand Up @@ -286,6 +289,54 @@ typedef struct {
SetSharedPixmapBackingProcPtr SavedSetSharedPixmapBacking;
} glamor;

/* glamor API */
struct {

PixmapPtr (*create_pixmap) (ScreenPtr,int,int, int, unsigned int);

Bool (*back_pixmap_from_fd)(PixmapPtr, int, CARD16, CARD16, CARD16,
CARD8, CARD8);
void (*block_handler)(ScreenPtr);
/* void (*clear_pixmap)(PixmapPtr); */
Bool (*egl_create_textured_pixmap)(PixmapPtr, int, int);
Bool (*egl_create_textured_pixmap_from_gbm_bo)(PixmapPtr,
struct gbm_bo *,
Bool);
void (*egl_exchange_buffers)(PixmapPtr, PixmapPtr);
struct gbm_device *(*egl_get_gbm_device)(ScreenPtr);
Bool (*egl_init)(ScrnInfoPtr, int);
void (*finish)(ScreenPtr);
/* struct gbm_bo *(*gbm_bo_from_pixmap)(ScreenPtr, PixmapPtr); */
Bool (*init)(ScreenPtr, unsigned int);
/* int (*name_from_pixmap)(PixmapPtr, CARD16 *, CARD32 *); */
/* void (*set_drawable_modifiers_func)(ScreenPtr,
GetDrawableModifiersFuncPtr); */
/* int (*shareable_fd_from_pixmap)(ScreenPtr, PixmapPtr, CARD16 *,
CARD32 *); */
/* Bool (*supports_pixmap_import_export)(ScreenPtr); */
XF86VideoAdaptorPtr (*xv_init)(ScreenPtr, int);
/* const char *(*egl_get_driver_name)(ScreenPtr); */

int (*fd_from_pixmap)(ScreenPtr, PixmapPtr, CARD16 *, CARD32 *);
void (*validate_gc) (GCPtr, unsigned long, DrawablePtr);

/* PixmapPtr (*pixmap_from_fds)(ScreenPtr, CARD8,const int *,CARD16,CARD16,const CARD32 *,const CARD32 *,CARD8,CARD8,uint64_t); */
PixmapPtr (*pixmap_from_fd)(ScreenPtr,int,CARD16,CARD16,CARD16,CARD8,CARD8);


} glamor_abi;

/* shadow API */
struct {
Bool (*Setup)(ScreenPtr);
Bool (*Add)(ScreenPtr, PixmapPtr, ShadowUpdateProc, ShadowWindowProc,
int, void *);
/* void (*Remove)(ScreenPtr, PixmapPtr); */
/* void (*Update32to24)(ScreenPtr, shadowBufPtr); */
void (*UpdatePacked)(ScreenPtr, shadowBufPtr);
} shadow_abi;


xf86CrtcFuncsRec drmmode_crtc_funcs;
} AMDGPUInfoRec, *AMDGPUInfoPtr;

Expand Down
32 changes: 19 additions & 13 deletions src/amdgpu_glamor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void amdgpu_glamor_exchange_buffers(PixmapPtr src, PixmapPtr dst)

if (!info->use_glamor)
return;
glamor_egl_exchange_buffers(src, dst);
info->glamor_abi.egl_exchange_buffers(src, dst);
}

Bool amdgpu_glamor_create_screen_resources(ScreenPtr screen)
Expand Down Expand Up @@ -72,7 +72,7 @@ Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn)
}

/* Load glamor module */
if ((glamor_module = xf86LoadSubModule(scrn, GLAMOR_EGL_MODULE_NAME))) {
if ((glamor_module = xf86LoadSubModule(scrn, "glamoregl"))) {
version = xf86GetModuleVersion(glamor_module);
if (version < MODULE_VERSION_NUMERIC(0, 3, 1)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
Expand All @@ -89,7 +89,7 @@ Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn)
return FALSE;
}

if (glamor_egl_init(scrn, pAMDGPUEnt->fd)) {
if (info->glamor_abi.egl_init(scrn, pAMDGPUEnt->fd)) {
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"glamor detected, initialising EGL layer.\n");
} else {
Expand Down Expand Up @@ -118,7 +118,7 @@ amdgpu_glamor_create_textured_pixmap(PixmapPtr pixmap, struct amdgpu_buffer *bo)
return TRUE;

if (bo->flags & AMDGPU_BO_FLAGS_GBM) {
return glamor_egl_create_textured_pixmap_from_gbm_bo(pixmap,
return info->glamor_abi.egl_create_textured_pixmap_from_gbm_bo(pixmap,
bo->bo.gbm,
FALSE);
} else {
Expand All @@ -127,7 +127,7 @@ amdgpu_glamor_create_textured_pixmap(PixmapPtr pixmap, struct amdgpu_buffer *bo)
if (!amdgpu_bo_get_handle(bo, &bo_handle))
return FALSE;

return glamor_egl_create_textured_pixmap(pixmap, bo_handle,
return info->glamor_abi.egl_create_textured_pixmap(pixmap, bo_handle,
pixmap->devKind);
}
}
Expand Down Expand Up @@ -188,7 +188,7 @@ amdgpu_glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
usage |= AMDGPU_CREATE_PIXMAP_LINEAR |
AMDGPU_CREATE_PIXMAP_GTT;
} else if (usage != CREATE_PIXMAP_USAGE_BACKING_PIXMAP) {
pixmap = glamor_create_pixmap(screen, w, h, depth, usage);
pixmap = info->glamor_abi.create_pixmap(screen, w, h, depth, usage);
if (pixmap)
return pixmap;
}
Expand Down Expand Up @@ -253,7 +253,7 @@ amdgpu_glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
* texture only pixmap and will never fallback to DDX layer
* afterwards.
*/
new_pixmap = glamor_create_pixmap(screen, w, h, depth, usage);
new_pixmap = info->glamor_abi.create_pixmap(screen, w, h, depth, usage);
amdgpu_bo_unref(&priv->bo);
fallback_priv:
free(priv);
Expand All @@ -271,6 +271,10 @@ amdgpu_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
PixmapPtr old = get_drawable_pixmap(drawable);
ScreenPtr screen = drawable->pScreen;
struct amdgpu_pixmap *priv = amdgpu_get_pixmap_private(pixmap);

ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
AMDGPUInfoPtr info = AMDGPUPTR(scrn);

GCPtr gc;

/* With a glamor pixmap, 2D pixmaps are created in texture
Expand All @@ -297,7 +301,7 @@ amdgpu_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
}

/* And redirect the pixmap to the new bo (for 3D). */
glamor_egl_exchange_buffers(old, pixmap);
info->glamor_abi.egl_exchange_buffers(old, pixmap);
amdgpu_set_pixmap_private(pixmap, amdgpu_get_pixmap_private(old));
amdgpu_set_pixmap_private(old, priv);

Expand Down Expand Up @@ -358,7 +362,7 @@ amdgpu_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
amdgpu_glamor_set_pixmap_bo(&pixmap->drawable, linear);
}

fd = glamor_fd_from_pixmap(screen, pixmap, &stride, &size);
fd = info->glamor_abi.fd_from_pixmap(screen, pixmap, &stride, &size);
if (fd < 0)
return FALSE;

Expand Down Expand Up @@ -413,7 +417,7 @@ Bool amdgpu_glamor_init(ScreenPtr screen)
}
}

if (!glamor_init(screen, GLAMOR_USE_EGL_SCREEN | GLAMOR_USE_SCREEN |
if (!info->glamor_abi.init(screen, GLAMOR_USE_EGL_SCREEN | GLAMOR_USE_SCREEN |
GLAMOR_USE_PICTURE_SCREEN | GLAMOR_INVERTED_Y_AXIS |
GLAMOR_NO_DRI3)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
Expand Down Expand Up @@ -452,7 +456,7 @@ void amdgpu_glamor_flush(ScrnInfoPtr pScrn)
AMDGPUInfoPtr info = AMDGPUPTR(pScrn);

if (info->use_glamor) {
glamor_block_handler(pScrn->pScreen);
info->glamor_abi.block_handler(pScrn->pScreen);
}

info->gpu_flushed++;
Expand All @@ -463,7 +467,7 @@ void amdgpu_glamor_finish(ScrnInfoPtr pScrn)
AMDGPUInfoPtr info = AMDGPUPTR(pScrn);

if (info->use_glamor) {
glamor_finish(pScrn->pScreen);
info->glamor_abi.finish(pScrn->pScreen);
info->gpu_flushed++;
}
}
Expand All @@ -484,5 +488,7 @@ amdgpu_glamor_fini(ScreenPtr screen)

XF86VideoAdaptorPtr amdgpu_glamor_xv_init(ScreenPtr pScreen, int num_adapt)
{
return glamor_xv_init(pScreen, num_adapt);
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
return info->glamor_abi.xv_init(pScreen, num_adapt);
}
7 changes: 1 addition & 6 deletions src/amdgpu_glamor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,7 @@ PixmapPtr amdgpu_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap);

XF86VideoAdaptorPtr amdgpu_glamor_xv_init(ScreenPtr pScreen, int num_adapt);

/* glamor_fds_from_pixmap declaration - only available when DRI3 is enabled */
#ifndef GLAMOR_NO_DRI3
extern int glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
uint32_t *strides, uint32_t *offsets,
uint64_t *modifier);
#endif


/* DRI3 drawable modifiers callback */
#ifdef GBM_BO_WITH_MODIFIERS
Expand Down
2 changes: 1 addition & 1 deletion src/amdgpu_glamor_wrappers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ amdgpu_glamor_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawabl
ScrnInfoPtr scrn = xf86ScreenToScrn(pGC->pScreen);
AMDGPUInfoPtr info = AMDGPUPTR(scrn);

glamor_validate_gc(pGC, changes, pDrawable);
info->glamor_abi.validate_gc(pGC, changes, pDrawable);
info->glamor.SavedCopyArea = pGC->ops->CopyArea;
info->glamor.SavedPolyFillRect = pGC->ops->PolyFillRect;

Expand Down
Loading
Loading