From: Thomas Hellström Date: Mon, 28 Apr 2025 15:42:49 +0000 (+0200) Subject: Merge drm/drm-next into drm-xe-next X-Git-Tag: v6.16-rc1~144^2~17^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb53d05ba71b684f61bd11df8b99fe75ce52754;p=thirdparty%2Fkernel%2Flinux.git Merge drm/drm-next into drm-xe-next Additional backmerge to avoid excessive diffstats when sending PR. Signed-off-by: Thomas Hellström --- 1bb53d05ba71b684f61bd11df8b99fe75ce52754 diff --cc drivers/gpu/drm/xe/xe_bo.h index 8bc449c78cc73,b39b465708085..02ada1fb8a235 --- a/drivers/gpu/drm/xe/xe_bo.h +++ b/drivers/gpu/drm/xe/xe_bo.h @@@ -274,11 -274,9 +274,11 @@@ uint64_t vram_region_gpu_offset(struct bool xe_bo_can_migrate(struct xe_bo *bo, u32 mem_type); int xe_bo_migrate(struct xe_bo *bo, u32 mem_type); - int xe_bo_evict(struct xe_bo *bo, bool force_alloc); + int xe_bo_evict(struct xe_bo *bo); int xe_bo_evict_pinned(struct xe_bo *bo); +int xe_bo_notifier_prepare_pinned(struct xe_bo *bo); +int xe_bo_notifier_unprepare_pinned(struct xe_bo *bo); int xe_bo_restore_pinned(struct xe_bo *bo); int xe_bo_dma_unmap_pinned(struct xe_bo *bo);