|
@@ -689,16 +689,15 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
|
|
static void
|
|
static void
|
|
i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)
|
|
i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)
|
|
{
|
|
{
|
|
- struct scatterlist *sg;
|
|
|
|
- int i;
|
|
|
|
|
|
+ struct sg_page_iter sg_iter;
|
|
|
|
|
|
BUG_ON(obj->userptr.work != NULL);
|
|
BUG_ON(obj->userptr.work != NULL);
|
|
|
|
|
|
if (obj->madv != I915_MADV_WILLNEED)
|
|
if (obj->madv != I915_MADV_WILLNEED)
|
|
obj->dirty = 0;
|
|
obj->dirty = 0;
|
|
|
|
|
|
- for_each_sg(obj->pages->sgl, sg, obj->pages->nents, i) {
|
|
|
|
- struct page *page = sg_page(sg);
|
|
|
|
|
|
+ for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
|
|
|
|
+ struct page *page = sg_page_iter_page(&sg_iter);
|
|
|
|
|
|
if (obj->dirty)
|
|
if (obj->dirty)
|
|
set_page_dirty(page);
|
|
set_page_dirty(page);
|