From 4e7201796c952c59059f999bfd5ad1fa929bedf5 Mon Sep 17 00:00:00 2001 From: stefan11111 Date: Fri, 6 Feb 2026 21:50:54 +0200 Subject: [PATCH] modesetting: Further port away from drmmode_bo Signed-off-by: stefan11111 --- hw/xfree86/drivers/video/modesetting/driver.c | 5 ++--- hw/xfree86/drivers/video/modesetting/drmmode_display.c | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/drivers/video/modesetting/driver.c b/hw/xfree86/drivers/video/modesetting/driver.c index 18cfbe25c..4c40075e8 100644 --- a/hw/xfree86/drivers/video/modesetting/driver.c +++ b/hw/xfree86/drivers/video/modesetting/driver.c @@ -73,6 +73,7 @@ #endif #include "driver.h" +#include "drmmode_bo.h" static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y); static Bool CloseScreen(ScreenPtr pScreen); @@ -1707,9 +1708,7 @@ modesetCreateScreenResources(ScreenPtr pScreen) drmmode_uevent_init(pScrn, &ms->drmmode); if (!ms->drmmode.glamor) { - pixels = drmmode_map_front_bo(&ms->drmmode); - if (!pixels) - return FALSE; + pixels = gbm_bo_get_map(ms->drmmode.front_bo.gbm); } rootPixmap = pScreen->GetScreenPixmap(pScreen); diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.c b/hw/xfree86/drivers/video/modesetting/drmmode_display.c index d56466509..5e2806ec6 100644 --- a/hw/xfree86/drivers/video/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.c @@ -2361,7 +2361,7 @@ drmmode_shadow_fb_create(xf86CrtcPtr crtc, void *data, int width, int height, return NULL; } - pPixData = drmmode_bo_map(drmmode, bo); + pPixData = gbm_bo_get_map(bo->gbm); pitch = gbm_bo_get_stride(bo->gbm); pixmap = drmmode_create_pixmap_header(scrn->pScreen, @@ -4009,9 +4009,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) scrn->displayWidth = pitch / kcpp; if (!drmmode->glamor) { - new_pixels = drmmode_map_front_bo(drmmode); - if (!new_pixels) - goto fail; + new_pixels = gbm_bo_get_map(drmmode->front_bo.gbm); } if (drmmode->shadow_enable) {