From 52cdbd78ec419ed3ae89673c6e99aa3045980f66 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 28 Jul 2025 12:58:45 -0700 Subject: [PATCH] i915: Avoid calling drm_intel_get_aperture_sizes(). It brings up and tears down libpci in order to return value we don't use, which is a problem if anything else in the stack is using libpci. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13413 Cc: mesa-stable Part-of: --- src/gallium/winsys/i915/drm/i915_drm_winsys.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c index 1011a16d4bb..ca21b50e3c1 100644 --- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c +++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c @@ -8,6 +8,7 @@ #include "i915_drm_winsys.h" #include "i915_drm_public.h" #include "util/u_memory.h" +#include "util/os_drm.h" #include "intel/common/intel_gem.h" @@ -27,11 +28,11 @@ static int i915_drm_aperture_size(struct i915_winsys *iws) { struct i915_drm_winsys *idws = i915_drm_winsys(iws); - size_t aper_size, mappable_size; - drm_intel_get_aperture_sizes(idws->fd, &mappable_size, &aper_size); - - return aper_size >> 20; + struct drm_i915_gem_get_aperture aperture = { 0 }; + ASSERTED int ret = drm_ioctl(idws->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture); + assert(ret == 0); + return aperture.aper_size >> 20; } static void