compat-drivers: refresh patches for next-20121008

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/drm/01-dma_buf_ops-addition.patch b/patches/drm/01-dma_buf_ops-addition.patch
index 4b3026e54a88d79601bf728ccd8d9bfb8e4fbcce..3decf0e27eb503b14f82945eaabec0214fec8e00 100644 (file)
--- a/patches/drm/01-dma_buf_ops-addition.patch
+++ b/patches/drm/01-dma_buf_ops-addition.patch
@@ -27,7 +27,7 @@ on kernels < 3.4.
  struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
-@@ -134,9 +134,11 @@ static const struct dma_buf_ops nouveau_
+@@ -132,9 +132,11 @@ static const struct dma_buf_ops nouveau_
        .kmap_atomic = nouveau_gem_kmap_atomic,
        .kunmap = nouveau_gem_kunmap,
        .kunmap_atomic = nouveau_gem_kunmap_atomic,
@@ -41,7 +41,7 @@ on kernels < 3.4.
  static int
 --- a/drivers/gpu/drm/radeon/radeon_prime.c
 +++ b/drivers/gpu/drm/radeon/radeon_prime.c
-@@ -134,9 +134,11 @@ const static struct dma_buf_ops radeon_d
+@@ -133,9 +133,11 @@ const static struct dma_buf_ops radeon_d
        .kmap_atomic = radeon_gem_kmap_atomic,
        .kunmap = radeon_gem_kunmap,
        .kunmap_atomic = radeon_gem_kunmap_atomic,

diff --git a/patches/drm/02-revert-vm_mmap.patch b/patches/drm/02-revert-vm_mmap.patch
index acdb656677982bf1355d91e889353258cbad91f9..b96562e600f4186cf7e5cb3be75ae1e7bdbf4dbc 100644 (file)
--- a/patches/drm/02-revert-vm_mmap.patch
+++ b/patches/drm/02-revert-vm_mmap.patch
@@ -36,7 +36,7 @@ These can't be backported as they rely on non-exported symbols.
                        /* Real error */
 --- a/drivers/gpu/drm/i810/i810_dma.c
 +++ b/drivers/gpu/drm/i810/i810_dma.c
-@@ -136,9 +136,17 @@ static int i810_map_buffer(struct drm_bu
+@@ -135,9 +135,17 @@ static int i810_map_buffer(struct drm_bu
        old_fops = file_priv->filp->f_op;
        file_priv->filp->f_op = &i810_buffer_fops;
        dev_priv->mmap_buffer = buf;
@@ -54,7 +54,7 @@ These can't be backported as they rely on non-exported symbols.
        dev_priv->mmap_buffer = NULL;
        file_priv->filp->f_op = old_fops;
        if (IS_ERR(buf_priv->virtual)) {
-@@ -159,9 +167,15 @@ static int i810_unmap_buffer(struct drm_
+@@ -158,9 +166,15 @@ static int i810_unmap_buffer(struct drm_
        if (buf_priv->currently_mapped != I810_BUF_MAPPED)
                return -EINVAL;
  
@@ -73,7 +73,7 @@ These can't be backported as they rely on non-exported symbols.
  
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1296,10 +1296,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
+@@ -1295,10 +1295,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
                drm_gem_object_unreference_unlocked(obj);
                return -EINVAL;
        }

diff --git a/patches/drm/03-swiotlb.patch b/patches/drm/03-swiotlb.patch
index cdc72ed518842c84284ca581a1c2e3b045e97196..944c25634ca6f1ed2cfc0c85d739cfdc2d55aac2 100644 (file)
--- a/patches/drm/03-swiotlb.patch
+++ b/patches/drm/03-swiotlb.patch
@@ -5,7 +5,7 @@ to backport it to compat.git. So revert the changes.
 
 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -1297,11 +1297,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
+@@ -1374,11 +1374,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
        }
  #endif
  
@@ -19,7 +19,7 @@ to backport it to compat.git. So revert the changes.
  
        r = ttm_pool_populate(ttm);
        if (r) {
-@@ -1347,12 +1349,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
+@@ -1424,12 +1426,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
        }
  #endif
  

diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch
index 428c0faa2650850d302e70172f79c6a1e6329975..68f4a5060befecd69f831ab2372d1517b2aa0056 100644 (file)
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -81,7 +81,7 @@ not < 3.3.0.
 +
  #include <linux/export.h>
  #include <linux/dma-buf.h>
- #include "drmP.h"
+ #include <drm/drmP.h>
 @@ -350,3 +352,4 @@ void drm_prime_remove_imported_buf_handl
        mutex_unlock(&prime_fpriv->lock);
  }
@@ -120,7 +120,7 @@ not < 3.3.0.
 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -344,8 +344,10 @@ static const struct file_operations rade
+@@ -345,8 +345,10 @@ static const struct file_operations rade
  static struct drm_driver kms_driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
@@ -133,7 +133,7 @@ not < 3.3.0.
        .dev_priv_size = 0,
        .load = radeon_driver_load_kms,
        .firstopen = radeon_driver_firstopen_kms,
-@@ -380,10 +382,12 @@ static struct drm_driver kms_driver = {
+@@ -381,10 +383,12 @@ static struct drm_driver kms_driver = {
        .dumb_destroy = radeon_mode_dumb_destroy,
        .fops = &radeon_driver_kms_fops,
  
@@ -148,7 +148,7 @@ not < 3.3.0.
        .desc = DRIVER_DESC,
 --- a/drivers/gpu/drm/radeon/radeon_gem.c
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -42,8 +42,10 @@ void radeon_gem_object_free(struct drm_g
+@@ -41,8 +41,10 @@ void radeon_gem_object_free(struct drm_g
        struct radeon_bo *robj = gem_to_radeon_bo(gobj);
  
        if (robj) {
@@ -198,7 +198,7 @@ not < 3.3.0.
  #if __OS_HAS_AGP
 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -1275,11 +1275,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
+@@ -1352,11 +1352,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
        struct drm_device *dev;
        unsigned i;
        int r;
@@ -213,16 +213,16 @@ not < 3.3.0.
        if (slave && ttm->sg) {
                /* make userspace faulting work */
                drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
-@@ -1287,6 +1290,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
+@@ -1364,6 +1367,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
                ttm->state = tt_unbound;
                return 0;
        }
 +#endif
  
-       dev_priv = nouveau_bdev(ttm->bdev);
-       dev = dev_priv->dev;
-@@ -1334,10 +1338,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
-       struct drm_nouveau_private *dev_priv;
+       drm = nouveau_bdev(ttm->bdev);
+       dev = drm->dev;
+@@ -1411,10 +1415,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
+       struct nouveau_drm *drm;
        struct drm_device *dev;
        unsigned i;
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
@@ -232,8 +232,8 @@ not < 3.3.0.
                return;
 +#endif
  
-       dev_priv = nouveau_bdev(ttm->bdev);
-       dev = dev_priv->dev;
+       drm = nouveau_bdev(ttm->bdev);
+       dev = drm->dev;
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
 @@ -581,7 +581,10 @@ driver = {
@@ -286,7 +286,7 @@ not < 3.3.0.
  
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -955,7 +955,11 @@ static struct drm_driver driver = {
+@@ -954,7 +954,11 @@ static struct drm_driver driver = {
         */
        .driver_features =
            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
@@ -298,7 +298,7 @@ not < 3.3.0.
        .load = i915_driver_load,
        .unload = i915_driver_unload,
        .open = i915_driver_open,
-@@ -978,10 +982,12 @@ static struct drm_driver driver = {
+@@ -977,10 +981,12 @@ static struct drm_driver driver = {
        .gem_free_object = i915_gem_free_object,
        .gem_vm_ops = &i915_gem_vm_ops,
  
@@ -313,7 +313,7 @@ not < 3.3.0.
        .dumb_map_offset = i915_gem_mmap_gtt,
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -35,7 +35,9 @@
+@@ -34,7 +34,9 @@
  #include <linux/slab.h>
  #include <linux/swap.h>
  #include <linux/pci.h>
@@ -323,7 +323,7 @@ not < 3.3.0.
  
  static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
  static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3767,8 +3769,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3766,8 +3768,10 @@ void i915_gem_free_object(struct drm_gem
  
        BUG_ON(obj->pages);
  

diff --git a/patches/drm/07-intel-gtt.patch b/patches/drm/07-intel-gtt.patch
index 378d32cd794963a432e0b152cb3c8a31dc01750f..c40ae7c33504f50b3a383584a998db6ade37e7e7 100644 (file)
--- a/patches/drm/07-intel-gtt.patch
+++ b/patches/drm/07-intel-gtt.patch
@@ -24,7 +24,7 @@ Date:   Thu Jun 7 15:56:03 2012 +0200
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3962,8 +3962,10 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3961,8 +3961,10 @@ i915_gem_init_hw(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
  

diff --git a/patches/drm/08-shmem_truncate_range.patch b/patches/drm/08-shmem_truncate_range.patch
index 08d1eca025c9dd4e5b52a2bad688871a039de1f2..0955648210badbd1ac404adf285fc586f091f0f7 100644 (file)
--- a/patches/drm/08-shmem_truncate_range.patch
+++ b/patches/drm/08-shmem_truncate_range.patch
@@ -27,7 +27,7 @@ Date:   Mon Jun 27 16:18:19 2011 -0700
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1643,7 +1643,14 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1642,7 +1642,14 @@ i915_gem_object_truncate(struct drm_i915
         * backing pages, *now*.
         */
        inode = obj->base.filp->f_path.dentry->d_inode;

diff --git a/patches/drm/98-pr_fmt.patch b/patches/drm/98-pr_fmt.patch
index def871cd81f6f564d5aa640ed3eea0bf5f117ad5..f2dd3f88658d4fb27e35647edc179761678e8ae1 100644 (file)
--- a/patches/drm/98-pr_fmt.patch
+++ b/patches/drm/98-pr_fmt.patch
@@ -125,9 +125,9 @@ Patch adapted from compat-wireless tree.
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
- #include "drmP.h"
-@@ -36,6 +37,7 @@
- #include "i915_drm.h"
+ #include <drm/drmP.h>
+@@ -35,6 +36,7 @@
+ #include <drm/i915_drm.h>
  #include "i915_drv.h"
  #include "i915_trace.h"
 +#include <linux/printk.h>
@@ -146,7 +146,7 @@ Patch adapted from compat-wireless tree.
 +#include <linux/printk.h>
  #include <linux/sysrq.h>
  #include <linux/slab.h>
- #include "drmP.h"
+ #include <drm/drmP.h>
 --- a/drivers/gpu/drm/i915/intel_opregion.c
 +++ b/drivers/gpu/drm/i915/intel_opregion.c
 @@ -25,8 +25,10 @@

diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch
index 463253bc9a6061dd58de25ee154fb2c79e50b09a..6725f8046276b05f0617c8369d8d3997d4eb495b 100644 (file)
--- a/patches/network/11-dev-pm-ops.patch
+++ b/patches/network/11-dev-pm-ops.patch
@@ -109,7 +109,7 @@ calls on compat code with only slight modifications.
  module_pci_driver(ath5k_pci_driver);
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -338,14 +338,10 @@ static int ath_pci_resume(struct device
+@@ -345,14 +345,10 @@ static int ath_pci_resume(struct device
        return 0;
  }
  
@@ -128,7 +128,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS  (&ath9k_pm_ops)
  
-@@ -363,7 +359,12 @@ static struct pci_driver ath_pci_driver
+@@ -370,7 +366,12 @@ static struct pci_driver ath_pci_driver
        .id_table   = ath_pci_id_table,
        .probe      = ath_pci_probe,
        .remove     = ath_pci_remove,