diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-11-11 01:14:02 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-11-11 01:14:19 +0300 |
| commit | f8ca7b74192b2e64bdfb89fb63c1d33b92bc899d (patch) | |
| tree | 1fcf742adb2cefef5b018d5a4753c1e6f6d611da /include/drm | |
| parent | 917a6f0bdbc55c2e9770ab523768578db8e8ddb3 (diff) | |
| parent | bcae3af286f49bf4f6cda03f165fbe530f4a6bed (diff) | |
| download | linux-f8ca7b74192b2e64bdfb89fb63c1d33b92bc899d.tar.xz | |
Merge tag 'drm-misc-next-fixes-2021-11-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Removed the TTM Huge Page functionnality to address a crash, a timeout
fix for udl, CONFIG_FB dependency improvements, a fix for a circular
locking depency in imx, a NULL pointer dereference fix for virtio, and a
naming collision fix for drm/locking.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211110082114.vfpkpnecwdfg27lk@gilmour
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 0551e2587f14..cd785cfa3123 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -584,8 +584,7 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo, vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, pgprot_t prot, - pgoff_t num_prefault, - pgoff_t fault_page_size); + pgoff_t num_prefault); vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf); |