diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-29 23:32:00 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-30 01:40:05 -0700 |
| commit | 31beeadb17fcf7d48fcbd0f9495f50002371c383 (patch) | |
| tree | 6a8ff06568da778f7225ac9590667699df6cdf7e /patches/collateral-evolutions/drm | |
| parent | a29c78e9bc6d0e75935dae13d9bf0687d8880849 (diff) | |
backports: refresh patches for v3.10.4v3.10.4-1
1 2.6.24 [ OK ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.79 [ OK ]
18 3.1.10 [ OK ]
19 3.2.45 [ OK ]
20 3.3.8 [ OK ]
21 3.4.46 [ OK ]
22 3.5.7 [ OK ]
23 3.6.11 [ OK ]
24 3.7.10 [ OK ]
25 3.8.13 [ OK ]
26 3.9.3 [ OK ]
real 33m18.960s
user 900m1.540s
sys 125m0.580s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/drm')
4 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch index fd7a9812..3167c0b2 100644 --- a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch +++ b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -1291,10 +1291,17 @@ i915_gem_mmap_ioctl(struct drm_device *d +@@ -1292,10 +1292,17 @@ i915_gem_mmap_ioctl(struct drm_device *d drm_gem_object_unreference_unlocked(obj); return -EINVAL; } diff --git a/patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_i915_i915_gem.patch index dd9ae0ec..a3f72657 100644 --- a/patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_i915_i915_gem.patch +++ b/patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_i915_i915_gem.patch @@ -2,7 +2,7 @@ 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 -@@ -1808,6 +1808,7 @@ i915_gem_object_get_pages_gtt(struct drm +@@ -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); } @@ -10,7 +10,7 @@ index 0022afd..2616dae 100644 #ifdef CONFIG_SWIOTLB if (swiotlb_nr_tbl()) { st->nents++; -@@ -1816,6 +1817,7 @@ i915_gem_object_get_pages_gtt(struct drm +@@ -1817,6 +1818,7 @@ i915_gem_object_get_pages_gtt(struct drm continue; } #endif @@ -18,7 +18,7 @@ index 0022afd..2616dae 100644 if (!i || page_to_pfn(page) != last_pfn + 1) { if (i) sg = sg_next(sg); -@@ -1826,9 +1828,11 @@ i915_gem_object_get_pages_gtt(struct drm +@@ -1827,9 +1829,11 @@ i915_gem_object_get_pages_gtt(struct drm } last_pfn = page_to_pfn(page); } diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch index be24455e..f3e50d28 100644 --- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch +++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4006,9 +4006,14 @@ i915_gem_init_hw(struct drm_device *dev) +@@ -4007,9 +4007,14 @@ i915_gem_init_hw(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; int ret; diff --git a/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch index 389e4059..052a2c52 100644 --- a/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch +++ b/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -1615,7 +1615,13 @@ i915_gem_object_truncate(struct drm_i915 +@@ -1616,7 +1616,13 @@ i915_gem_object_truncate(struct drm_i915 * backing pages, *now*. */ inode = file_inode(obj->base.filp); |