diff options
| author | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2025-04-28 17:42:49 +0200 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2025-04-28 17:42:49 +0200 |
| commit | 1bb53d05ba71b684f61bd11df8b99fe75ce52754 (patch) | |
| tree | cb78297961e10a9aa77b412a2217f52cfddf0ccb /include/drm | |
| parent | 84a11c519234bfa3f6971f30d1a7c84077a4d681 (diff) | |
| parent | d2b9e2f8a15d53121ae8f2c67b69cf06b6fa586c (diff) | |
Merge drm/drm-next into drm-xe-next
Additional backmerge to avoid excessive diffstats when
sending PR.
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/ttm/ttm_bo.h b/include/drm/ttm/ttm_bo.h index 903cd1030110..cf027558b6db 100644 --- a/include/drm/ttm/ttm_bo.h +++ b/include/drm/ttm/ttm_bo.h @@ -172,7 +172,6 @@ struct ttm_bo_kmap_obj { * @gfp_retry_mayfail: Set the __GFP_RETRY_MAYFAIL when allocation pages. * @allow_res_evict: Allow eviction of reserved BOs. Can be used when multiple * BOs share the same reservation object. - * @force_alloc: Don't check the memory account during suspend or CPU page * faults. Should only be used by TTM internally. * @resv: Reservation object to allow reserved evictions with. * @bytes_moved: Statistics on how many bytes have been moved. @@ -185,7 +184,6 @@ struct ttm_operation_ctx { bool no_wait_gpu; bool gfp_retry_mayfail; bool allow_res_evict; - bool force_alloc; struct dma_resv *resv; uint64_t bytes_moved; }; |