compat-drivers: refresh patches

This was done by running "./scripts/admin-refresh.sh refresh".

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch
index b244210b..e12c396d 100644
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -21,7 +21,7 @@ not < 3.3.0.
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
 --- a/drivers/gpu/drm/drm_fops.c
 +++ b/drivers/gpu/drm/drm_fops.c
-@@ -267,8 +267,10 @@ static int drm_open_helper(struct inode
+@@ -283,8 +283,10 @@ static int drm_open_helper(struct inode
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
  
@@ -32,7 +32,7 @@ not < 3.3.0.
  
  	if (dev->driver->open) {
  		ret = dev->driver->open(dev, priv);
-@@ -521,8 +523,10 @@ int drm_release(struct inode *inode, str
+@@ -537,8 +539,10 @@ int drm_release(struct inode *inode, str
  	if (dev->driver->postclose)
  		dev->driver->postclose(dev, file_priv);
  
@@ -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
-@@ -345,8 +345,10 @@ static const struct file_operations rade
+@@ -354,8 +354,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,
-@@ -381,10 +383,12 @@ static struct drm_driver kms_driver = {
+@@ -390,10 +392,12 @@ static struct drm_driver kms_driver = {
  	.dumb_destroy = radeon_mode_dumb_destroy,
  	.fops = &radeon_driver_kms_fops,
  
@@ -161,7 +161,7 @@ not < 3.3.0.
  }
 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -583,17 +583,21 @@ static int radeon_ttm_tt_populate(struct
+@@ -582,17 +582,21 @@ static int radeon_ttm_tt_populate(struct
  	struct radeon_ttm_tt *gtt = (void *)ttm;
  	unsigned i;
  	int r;
@@ -183,7 +183,7 @@ not < 3.3.0.
  
  	rdev = radeon_get_rdev(ttm->bdev);
  #if __OS_HAS_AGP
-@@ -637,10 +641,12 @@ static void radeon_ttm_tt_unpopulate(str
+@@ -636,10 +640,12 @@ static void radeon_ttm_tt_unpopulate(str
  	struct radeon_device *rdev;
  	struct radeon_ttm_tt *gtt = (void *)ttm;
  	unsigned i;
@@ -236,7 +236,7 @@ not < 3.3.0.
  	dev = drm->dev;
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -581,7 +581,10 @@ driver = {
+@@ -591,7 +591,10 @@ driver = {
  	.driver_features =
  		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
  		DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
@@ -248,7 +248,7 @@ not < 3.3.0.
  
  	.load = nouveau_drm_load,
  	.unload = nouveau_drm_unload,
-@@ -602,10 +605,12 @@ driver = {
+@@ -612,10 +615,12 @@ driver = {
  	.ioctls = nouveau_ioctls,
  	.fops = &nouveau_driver_fops,
  
@@ -286,7 +286,7 @@ not < 3.3.0.
  
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -967,7 +967,11 @@ static struct drm_driver driver = {
+@@ -1018,7 +1018,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,
-@@ -990,10 +994,12 @@ static struct drm_driver driver = {
+@@ -1041,10 +1045,12 @@ static struct drm_driver driver = {
  	.gem_free_object = i915_gem_free_object,
  	.gem_vm_ops = &i915_gem_vm_ops,
  
@@ -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);
-@@ -3776,8 +3778,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3778,8 +3780,10 @@ void i915_gem_free_object(struct drm_gem
  
  	BUG_ON(obj->pages);