diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2024-09-11 10:57:18 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-09-11 10:57:18 +0300 |
| commit | 02189ca8411253aa1328e9dd6137a40e390a5b37 (patch) | |
| tree | 94aa1a3f7aa6e863a790092dfe9d3b53c27565c3 /include/drm | |
| parent | 54df34c5a2439b481f066476e67bfa21a0a640e5 (diff) | |
| parent | b615b9c36cae0468491547206406a909a9a37f26 (diff) | |
| download | ath-02189ca8411253aa1328e9dd6137a40e390a5b37.tar.gz | |
Merge drm/drm-next into drm-intel-next
Sync the branches to resolve the conflict reported in the below link.
Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/drm/ttm/ttm_bo.h b/include/drm/ttm/ttm_bo.h index 7294dde240fb6..7b56d1ca36d75 100644 --- a/include/drm/ttm/ttm_bo.h +++ b/include/drm/ttm/ttm_bo.h @@ -39,11 +39,7 @@ #include "ttm_device.h" /* Default number of pre-faulted pages in the TTM fault handler */ -#if CONFIG_PGTABLE_LEVELS > 2 -#define TTM_BO_VM_NUM_PREFAULT (1 << (PMD_SHIFT - PAGE_SHIFT)) -#else #define TTM_BO_VM_NUM_PREFAULT 16 -#endif struct iosys_map; |