hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-28 02:21:08 +00:00
Code Issues Projects Releases Wiki Activity

modesetting: small formating changes and extra NULL checks

Browse source 
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111 2025-11-24 23:45:23 +02:00 • committed by Enrico Weigelt
commit 7b301ee278
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hw/xfree86/drivers/video/modesetting/drmmode_display.c
View file

@ -1012,8 +1012,6 @@ drmmode_crtc_flip(xf86CrtcPtr crtc, uint32_t fb_id, int x, int y,
void
drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo)
{
int ret;
#ifdef GLAMOR_HAS_GBM
if (bo->gbm) {
gbm_bo_destroy(bo->gbm);
@ -1022,9 +1020,10 @@ drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo)
#endif
if (bo->dumb) {
ret = dumb_bo_destroy(drmmode->fd, bo->dumb);
if (ret == 0)
int ret = dumb_bo_destroy(drmmode->fd, bo->dumb);
if (ret == 0) {
bo->dumb = NULL;
}
}
}
@ -1032,36 +1031,47 @@ uint32_t
drmmode_bo_get_pitch(drmmode_bo *bo)
{
#ifdef GLAMOR_HAS_GBM
if (bo->gbm)
if (bo->gbm) {
return gbm_bo_get_stride(bo->gbm);
}
#endif
return bo->dumb->pitch;
if (bo->dumb) {
return bo->dumb->pitch;
}
return 0;
}
static void*
drmmode_bo_get_bo(drmmode_bo *bo)
{
#ifdef GLAMOR_HAS_GBM
if (bo->gbm)
if (bo->gbm) {
return bo->gbm;
}
#endif
return bo->dumb;
}
uint32_t
static uint32_t
drmmode_bo_get_handle(drmmode_bo *bo)
{
#ifdef GLAMOR_HAS_GBM
if (bo->gbm)
if (bo->gbm) {
return gbm_bo_get_handle(bo->gbm).u32;
}
#endif
return bo->dumb->handle;
if (bo->dumb) {
return bo->dumb->handle;
}
return (uint32_t)-1;
}
static void *
static void*
drmmode_bo_map(drmmode_ptr drmmode, drmmode_bo *bo)
{
if (bo->map) {

1
hw/xfree86/drivers/video/modesetting/drmmode_display.h
View file

@ -325,7 +325,6 @@ int drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
uint32_t *fb_id);
void drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo);
uint32_t drmmode_bo_get_pitch(drmmode_bo *bo);
uint32_t drmmode_bo_get_handle(drmmode_bo *bo);
Bool drmmode_glamor_handle_new_screen_pixmap(drmmode_ptr drmmode);
void *drmmode_map_secondary_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv);
Bool drmmode_SetSlaveBO(PixmapPtr ppix,