Message ID | 1395915537-11086-1-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 03/27/2014 10:18 AM, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Looks like there are some redundant lines in the main loop of > i915_gem_object_get_pages_gtt. > > v2: Put CONFIG_SWIOTLB back in. > > I haven't tested this so just RFC please. Not sure that > seven lines net less is worth this. It just made it clerer > to a newby to sg building to think of it in terms of > "merge entries always except when...". For what it is worth, this builds and doesn't blow up on some smoke tests. Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 00c8361..b435db1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1912,15 +1912,11 @@ 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); } + if (!i || page_to_pfn(page) != last_pfn + 1 #ifdef CONFIG_SWIOTLB - if (swiotlb_nr_tbl()) { - st->nents++; - sg_set_page(sg, page, PAGE_SIZE, 0); - sg = sg_next(sg); - continue; - } + || swiotlb_nr_tbl() #endif - if (!i || page_to_pfn(page) != last_pfn + 1) { + ) { if (i) sg = sg_next(sg); st->nents++; @@ -1933,10 +1929,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) /* Check that the i965g/gm workaround works. */ WARN_ON((gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL)); } -#ifdef CONFIG_SWIOTLB - if (!swiotlb_nr_tbl()) -#endif - sg_mark_end(sg); + sg_mark_end(sg); obj->pages = st; if (i915_gem_object_needs_bit17_swizzle(obj))