Quoting john.hubbard@xxxxxxxxx (2019-08-02 05:19:37) > From: John Hubbard <jhubbard@xxxxxxxxxx> > > For pages that were retained via get_user_pages*(), release those pages > via the new put_user_page*() routines, instead of via put_page() or > release_pages(). > > This is part a tree-wide conversion, as described in commit fc1d8e7cca2d > ("mm: introduce put_user_page*(), placeholder versions"). > > Note that this effectively changes the code's behavior in > i915_gem_userptr_put_pages(): it now calls set_page_dirty_lock(), > instead of set_page_dirty(). This is probably more accurate. We've already fixed this in drm-tip where the current code uses set_page_dirty_lock(). This would conflict with our tree. Rodrigo is handling drm-intel-next for 5.4, so you guys want to coordinate how to merge. Regards, Joonas