fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 15:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: Improve and standardize the behavior of madvice in i915
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
This removes the conversion between iris_madvice and i915 values, placing it by
a static assert in case this values ever don't match.

Also adds a warn once in case of DRM_IOCTL_I915_GEM_MADVISE ever fails.

As at last in case of failure of DRM_IOCTL_I915_GEM_MADVISE returns as if the
bo is not retained anymore to have a safe behavior.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Suggested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40573>
This commit is contained in:
José Roberto de Souza 2026-03-31 11:47:40 -07:00 • committed by Marge Bot
parent cbc1ec206d
commit a2175b7ec3
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/iris/i915/iris_kmd_backend.c
View file

@ -28,6 +28,7 @@
#include "common/intel_gem.h"
#include "common/i915/intel_gem.h"
#include "dev/intel_debug.h"
#include "util/u_debug.h"
#include "drm-uapi/i915_drm.h"
@ -147,17 +148,20 @@ i915_gem_create(struct iris_bufmgr *bufmgr,
static bool
i915_bo_madvise(struct iris_bo *bo, enum iris_madvice state)
{
uint32_t i915_state = state == IRIS_MADVICE_WILL_NEED ?
I915_MADV_WILLNEED : I915_MADV_DONTNEED;
struct drm_i915_gem_madvise madv = {
.handle = bo->gem_handle,
.madv = i915_state,
.madv = state,
.retained = 1,
};
intel_ioctl(iris_bufmgr_get_fd(bo->bufmgr), DRM_IOCTL_I915_GEM_MADVISE, &madv);
/* Make sure iris_madvice values match with i915 values */
STATIC_ASSERT(IRIS_MADVICE_WILL_NEED == I915_MADV_WILLNEED);
STATIC_ASSERT(IRIS_MADVICE_DONT_NEED == I915_MADV_DONTNEED);
return madv.retained;
int ret = intel_ioctl(iris_bufmgr_get_fd(bo->bufmgr), DRM_IOCTL_I915_GEM_MADVISE, &madv);
if (ret)
debug_warn_once("DRM_IOCTL_I915_GEM_MADVISE failed at least once\n");
return ret == 0 ? madv.retained : false;
}
static int