diff options
| author |   Dave Airlie <airlied@redhat.com> | 2021-03-26 06:18:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-03-26 06:19:44 +1000 |
| commit | 0f43ad782cd41a9b5513c645af7ed033544a6f84 (patch) | |
| tree | ae7699d1dd03bdfdcdfe2d0767d8c823eff6cbc9 | |
| parent | Merge tag 'du-fixes-20210316' of git://linuxtv.org/pinchartl/media into drm-fixes (diff) | |
| parent | drm/etnaviv: User FOLL_LONGTERM in userptr (diff) | |
| download | linux-dev-0f43ad782cd41a9b5513c645af7ed033544a6f84.tar.xz linux-dev-0f43ad782cd41a9b5513c645af7ed033544a6f84.zip | |
Merge tag 'drm-misc-fixes-2021-03-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.12:
- Use FOLL_FORCE and FOLL_LONGTERM in etnaviv
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/72d4c9ce-6709-4e0f-a715-79fdcebb48e7@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 6d38c5c17f23..db69f19ab5bc 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -689,7 +689,8 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) struct page **pages = pvec + pinned; ret = pin_user_pages_fast(ptr, num_pages, - !userptr->ro ? FOLL_WRITE : 0, pages); + FOLL_WRITE | FOLL_FORCE | FOLL_LONGTERM, + pages); if (ret < 0) { unpin_user_pages(pvec, pinned); kvfree(pvec); |