| commit | 0f43ad782cd41a9b5513c645af7ed033544a6f84 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Mar 26 06:18:14 2021 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Mar 26 06:19:44 2021 +1000 |
| tree | ae7699d1dd03bdfdcdfe2d0767d8c823eff6cbc9 | |
| parent | d27ce83fa4baa5cb908a42e9878564cad6ea0eb3 [diff] | |
| parent | 50891bead80bc79871528c2962d65c781c02330b [diff] |
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
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 6d38c5c..db69f19 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -689,7 +689,8 @@ 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);