diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-06-06 13:45:10 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-06-13 11:23:34 -0700 |
| commit | a2e9e9f1e6278ecb605da657b704de9e6be6f12a (patch) | |
| tree | ca74cb3c0a508d1a7a59e2dd3e086a064f3fd7ad /patches/collateral-evolutions/drm | |
| parent | e6f7db937491bc1a7cc2b9c33c92fc3e0beb8c38 (diff) | |
backports: refersh patches on next-20130606backports-20130606
There was a manual adjustment needed in
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch
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.10-rc1 [ OK ]
20 3.2.45 [ OK ]
21 3.3.8 [ OK ]
22 3.4.46 [ OK ]
23 3.5.7 [ OK ]
24 3.6.11 [ OK ]
25 3.7.10 [ OK ]
26 3.8.13 [ OK ]
27 3.9.3 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/drm')
5 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/drm/0001-fb-info-vt_switch/drivers_gpu_drm_i915_intel_fb.patch b/patches/collateral-evolutions/drm/0001-fb-info-vt_switch/drivers_gpu_drm_i915_intel_fb.patch index cdc08bae..c0fab51f 100644 --- a/patches/collateral-evolutions/drm/0001-fb-info-vt_switch/drivers_gpu_drm_i915_intel_fb.patch +++ b/patches/collateral-evolutions/drm/0001-fb-info-vt_switch/drivers_gpu_drm_i915_intel_fb.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c -@@ -151,7 +151,7 @@ static int intelfb_create(struct drm_fb_ +@@ -152,7 +152,7 @@ static int intelfb_create(struct drm_fb_ info->screen_size = size; /* This driver doesn't need a VT switch to restore the mode on resume */ diff --git a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch index ba7b019b..5626d43e 100644 --- a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch +++ b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c -@@ -1541,6 +1541,20 @@ int drm_mapbufs(struct drm_device *dev, +@@ -1551,6 +1551,20 @@ int drm_mapbufs(struct drm_device *dev, retcode = -EINVAL; goto done; } @@ -21,7 +21,7 @@ virtual = vm_mmap(file_priv->filp, 0, map->size, PROT_READ | PROT_WRITE, MAP_SHARED, -@@ -1549,6 +1563,7 @@ int drm_mapbufs(struct drm_device *dev, +@@ -1559,6 +1573,7 @@ int drm_mapbufs(struct drm_device *dev, virtual = vm_mmap(file_priv->filp, 0, dma->byte_count, PROT_READ | PROT_WRITE, MAP_SHARED, 0); 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 c1bf49fa..1aeda521 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 -@@ -1294,10 +1294,17 @@ i915_gem_mmap_ioctl(struct drm_device *d +@@ -1296,10 +1296,17 @@ i915_gem_mmap_ioctl(struct drm_device *d drm_gem_object_unreference_unlocked(obj); return -EINVAL; } 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 092014e7..23b89900 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 -@@ -4051,9 +4051,14 @@ i915_gem_init_hw(struct drm_device *dev) +@@ -4065,9 +4065,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 71763009..fe2b8323 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 -@@ -1618,7 +1618,13 @@ i915_gem_object_truncate(struct drm_i915 +@@ -1620,7 +1620,13 @@ i915_gem_object_truncate(struct drm_i915 * backing pages, *now*. */ inode = file_inode(obj->base.filp); |