diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-08-30 11:28:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-08-30 11:28:11 +1000 |
| commit | 27f5b729cb56e46d8beca47c227c0edf1e958fbb (patch) | |
| tree | 07aa373fe5e76cea6ca2eed7a1c9eaf50c0a1f72 /include | |
| parent | dde72a5d4fdf2e18fedb4b2abfba5f7e86bcb7c8 (diff) | |
| parent | 9d824c7fce58f59982228aa85b0376b113cdfa35 (diff) | |
Merge tag 'drm-misc-fixes-2024-08-29' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
A revert for a previous TTM commit causing stuttering, 3 fixes for
vmwgfx related to buffer operations, a fix for video/aperture with
non-VGA primary devices, and a preemption status fix for v3d
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240829-efficient-swift-from-lemuria-f60c05@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/ttm/ttm_bo.h | 4 | ||||
| -rw-r--r-- | include/linux/sysfb.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/drm/ttm/ttm_bo.h b/include/drm/ttm/ttm_bo.h index ef0f52f56ebc..6ccf96c91f3a 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; diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index c9cb657dad08..bef5f06a91de 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -58,11 +58,11 @@ struct efifb_dmi_info { #ifdef CONFIG_SYSFB -void sysfb_disable(void); +void sysfb_disable(struct device *dev); #else /* CONFIG_SYSFB */ -static inline void sysfb_disable(void) +static inline void sysfb_disable(struct device *dev) { } |