Attachment 82344 Details for Bug 48652 – disable sg compaction

[patch] disable sg compaction

disable-sg-compaction.patch (text/plain), 1.25 KB, created by Imre Deak on 2013-07-11 18:30:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2013-07-11 18:30:28 UTC

Size: 1.25 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index cc77685..f6e50b2 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1748,7 +1748,6 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
> 	struct scatterlist *sg;
> 	struct sg_page_iter sg_iter;
> 	struct page *page;
>-	unsigned long last_pfn = 0;	/* suppress gcc warning */
> 	gfp_t gfp;
> 
> 	/* Assert that the object is not currently in any GPU domain. As it
>@@ -1802,28 +1801,10 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
> 			gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;
> 			gfp &= ~(__GFP_IO | __GFP_WAIT);
> 		}
>-#ifdef CONFIG_SWIOTLB
>-		if (swiotlb_nr_tbl()) {
>-			st->nents++;
>-			sg_set_page(sg, page, PAGE_SIZE, 0);
>-			sg = sg_next(sg);
>-			continue;
>-		}
>-#endif
>-		if (!i || page_to_pfn(page) != last_pfn + 1) {
>-			if (i)
>-				sg = sg_next(sg);
>-			st->nents++;
>-			sg_set_page(sg, page, PAGE_SIZE, 0);
>-		} else {
>-			sg->length += PAGE_SIZE;
>-		}
>-		last_pfn = page_to_pfn(page);
>+		st->nents++;
>+		sg_set_page(sg, page, PAGE_SIZE, 0);
>+		sg = sg_next(sg);
> 	}
>-#ifdef CONFIG_SWIOTLB
>-	if (!swiotlb_nr_tbl())
>-#endif
>-		sg_mark_end(sg);
> 	obj->pages = st;
> 
> 	if (i915_gem_object_needs_bit17_swizzle(obj))

Actions: View | Splinter Review

Attachments on bug 48652: 59911 | 59912 | 59913 | 59914 | 59915 | 59916 | 59917 | 59920 | 59957 | 60147 | 60168 | 60171 | 60444 | 62393 | 62395 | 62396 | 66158 | 66159 | 71397 | 81446 | 82263 | 82344 | 87402 | 87403 | 87441 | 87451

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.