blob: a3f7265760257225f5f686a820080ef5b460250e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0022afd..2616dae 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1809,6 +1809,7 @@ i915_gem_object_get_pages_gtt(struct drm
gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;
gfp &= ~(__GFP_IO | __GFP_WAIT);
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
#ifdef CONFIG_SWIOTLB
if (swiotlb_nr_tbl()) {
st->nents++;
@@ -1817,6 +1818,7 @@ i915_gem_object_get_pages_gtt(struct drm
continue;
}
#endif
+#endif
if (!i || page_to_pfn(page) != last_pfn + 1) {
if (i)
sg = sg_next(sg);
@@ -1827,9 +1829,11 @@ i915_gem_object_get_pages_gtt(struct drm
}
last_pfn = page_to_pfn(page);
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
#ifdef CONFIG_SWIOTLB
if (!swiotlb_nr_tbl())
#endif
+#endif
sg_mark_end(sg);
obj->pages = st;
|
