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 /drivers/gpu/drm/nouveau/nouveau_gem.c | |
| 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 'drivers/gpu/drm/nouveau/nouveau_gem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index b3210e9b2cd8..9416bee92141 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -56,7 +56,7 @@ static vm_fault_t nouveau_ttm_fault(struct vm_fault *vmf) nouveau_bo_del_io_reserve_lru(bo); prot = vm_get_page_prot(vma->vm_flags); - ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT, 1); + ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT); nouveau_bo_add_io_reserve_lru(bo); if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) return ret; |