XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-25 23:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

modesetting: Port backing bo the the gbm wrapper

Browse Source 
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2026-02-06 20:06:36 +02:00
committed by Enrico Weigelt
parent 12eceb7999
commit 5acd66c8ee
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xfree86/drivers/video/modesetting/drmmode_display.c
View File

@@ -1189,13 +1189,12 @@ drmmode_SetSlaveBO(PixmapPtr ppix,
msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix);
if (fd_handle == -1) {
dumb_bo_destroy(drmmode->fd, ppriv->backing_bo);
gbm_bo_destroy(ppriv->backing_bo);
ppriv->backing_bo = NULL;
return TRUE;
}
ppriv->backing_bo =
dumb_get_bo_from_fd(drmmode->fd, fd_handle, pitch, size);
ppriv->backing_bo = gbm_back_bo_from_fd(drmmode, TRUE, fd_handle, pitch, size);
if (!ppriv->backing_bo)
return FALSE;
@@ -2285,7 +2284,6 @@ drmmode_set_target_scanout_pixmap_cpu(xf86CrtcPtr crtc, PixmapPtr ppix,
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
msPixmapPrivPtr ppriv;
void *ptr;
if (*target) {
ppriv = msGetPixmapPriv(drmmode, *target);
@@ -2309,8 +2307,7 @@ drmmode_set_target_scanout_pixmap_cpu(xf86CrtcPtr crtc, PixmapPtr ppix,
crtc->randr_crtc->pScreen,
NULL);
}
ptr = drmmode_map_secondary_bo(drmmode, ppriv);
ppix->devPrivate.ptr = ptr;
ppix->devPrivate.ptr = gbm_bo_get_map(ppriv->backing_bo);
DamageRegister(&ppix->drawable, ppriv->secondary_damage);
if (ppriv->fb_id == 0) {
@@ -2318,7 +2315,7 @@ drmmode_set_target_scanout_pixmap_cpu(xf86CrtcPtr crtc, PixmapPtr ppix,
ppix->drawable.height,
ppix->drawable.depth,
ppix->drawable.bitsPerPixel,
ppix->devKind, ppriv->backing_bo->handle, &ppriv->fb_id);
ppix->devKind, gbm_bo_get_handle(ppriv->backing_bo).s32, &ppriv->fb_id);
}
*target = ppix;
return TRUE;
@@ -5073,21 +5070,6 @@ drmmode_map_front_bo(drmmode_ptr drmmode)
return drmmode_bo_map(drmmode, &drmmode->front_bo);
}
void *
drmmode_map_secondary_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv)
{
int ret;
if (ppriv->backing_bo->ptr)
return ppriv->backing_bo->ptr;
ret = dumb_bo_map(drmmode->fd, ppriv->backing_bo);
if (ret)
return NULL;
return ppriv->backing_bo->ptr;
}
void
drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{

2
hw/xfree86/drivers/video/modesetting/drmmode_display.h
View File

@@ -298,7 +298,7 @@ typedef struct {
typedef struct _msPixmapPriv {
uint32_t fb_id;
struct dumb_bo *backing_bo; /* if this pixmap is backed by a dumb bo */
struct gbm_bo *backing_bo; /* if this pixmap is backed by a gbm bo */
DamagePtr secondary_damage;