30 files changed, 57 insertions, 44 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 4cab0c6397e..7af44367262 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -73,7 +73,8 @@ source "drivers/gpu/drm/radeon/Kconfig"
 
 config DRM_I810
         tristate "Intel I810"
-        depends on DRM && AGP && AGP_INTEL
+        # BKL usage in order to avoid AB-BA deadlocks, may become BROKEN_ON_SMP
+        depends on DRM && AGP && AGP_INTEL && BKL
         help
           Choose this option if you have an Intel I810 graphics card.  If M is
           selected, the module will be called i810.  AGP support is required
@@ -86,6 +87,8 @@ choice
 
 config DRM_I830
         tristate "i830 driver"
+        # BKL usage in order to avoid AB-BA deadlocks, i830 may get removed
+        depends on BKL
         help
           Choose this option if you have a system that has Intel 830M, 845G,
           852GM, 855GM or 865G integrated graphics.  If M is selected, the
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 5ff75a3a6b9..271835a7157 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -280,7 +280,8 @@ EXPORT_SYMBOL(drm_exit);
 /** File operations structure */
 static const struct file_operations drm_stub_fops = {
         .owner = THIS_MODULE,
-        .open = drm_stub_open
+        .open = drm_stub_open,
+        .llseek = noop_llseek,
 };
 
 static int __init drm_core_init(void)
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 949326d2a8e..58e65f92c23 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -76,7 +76,7 @@ EXPORT_SYMBOL(drm_mode_debug_printmodeline);
  * according to the hdisplay, vdisplay, vrefresh.
  * It is based from the VESA(TM) Coordinated Video Timing Generator by
  * Graham Loveridge April 9, 2003 available at
- * http://www.vesa.org/public/CVT/CVTd6r1.xls
+ * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls 
  *
  * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c.
  * What I have done is to translate it by using integer calculation.
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index fb07e73581e..ff33e53bbbf 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -119,6 +119,7 @@ static const struct file_operations i810_buffer_fops = {
         .unlocked_ioctl = i810_ioctl,
         .mmap = i810_mmap_buffers,
         .fasync = drm_fasync,
+        .llseek = noop_llseek,
 };
 
 static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 1c73b0c43c1..88bcd331e7c 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -61,6 +61,7 @@ static struct drm_driver driver = {
                  .mmap = drm_mmap,
                  .poll = drm_poll,
                  .fasync = drm_fasync,
+                 .llseek = noop_llseek,
         },
 
         .pci_driver = {
diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c
index cc92c7e6236..ca6f31ff0ee 100644
--- a/drivers/gpu/drm/i830/i830_dma.c
+++ b/drivers/gpu/drm/i830/i830_dma.c
@@ -121,6 +121,7 @@ static const struct file_operations i830_buffer_fops = {
         .unlocked_ioctl = i830_ioctl,
         .mmap = i830_mmap_buffers,
         .fasync = drm_fasync,
+        .llseek = noop_llseek,
 };
 
 static int i830_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
diff --git a/drivers/gpu/drm/i830/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c
index 7140ffc12ee..f655ab7977d 100644
--- a/drivers/gpu/drm/i830/i830_drv.c
+++ b/drivers/gpu/drm/i830/i830_drv.c
@@ -72,6 +72,7 @@ static struct drm_driver driver = {
                  .mmap = drm_mmap,
                  .poll = drm_poll,
                  .fasync = drm_fasync,
+                 .llseek = noop_llseek,
         },
 
         .pci_driver = {
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 7698983577d..1f4f3ceb63c 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -974,6 +974,7 @@ static const struct file_operations i915_wedged_fops = {
         .open = i915_wedged_open,
         .read = i915_wedged_read,
         .write = i915_wedged_write,
+        .llseek = default_llseek,
 };
 
 /* As the drm_debugfs_init() routines are called before dev->dev_private is
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8e632110c58..3467dd42076 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -632,6 +632,7 @@ static struct drm_driver driver = {
 #ifdef CONFIG_COMPAT
                  .compat_ioctl = i915_compat_ioctl,
 #endif
+                 .llseek = noop_llseek,
         },
 
         .pci_driver = {
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6c2618d884e..8eb8453208b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -268,9 +268,9 @@ fast_shmem_read(struct page **pages,
         char *vaddr;
         int ret;
 
-        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT], KM_USER0);
+        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT]);
         ret = __copy_to_user_inatomic(data, vaddr + page_offset, length);
-        kunmap_atomic(vaddr, KM_USER0);
+        kunmap_atomic(vaddr);
 
         return ret;
 }
@@ -619,10 +619,10 @@ fast_user_write(struct io_mapping *mapping,
         char *vaddr_atomic;
         unsigned long unwritten;
 
-        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base, KM_USER0);
+        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base);
         unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + page_offset,
                                                       user_data, length);
-        io_mapping_unmap_atomic(vaddr_atomic, KM_USER0);
+        io_mapping_unmap_atomic(vaddr_atomic);
         return unwritten;
 }
 
@@ -659,9 +659,9 @@ fast_shmem_write(struct page **pages,
         char *vaddr;
         int ret;
 
-        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT], KM_USER0);
+        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT]);
         ret = __copy_from_user_inatomic(vaddr + page_offset, data, length);
-        kunmap_atomic(vaddr, KM_USER0);
+        kunmap_atomic(vaddr);
 
         return ret;
 }
@@ -3395,9 +3395,9 @@ i915_gem_execbuffer_relocate(struct drm_i915_gem_object *obj,
                         uint32_t page_offset = reloc.offset & ~PAGE_MASK;
                         char *vaddr;
 
-                        vaddr = kmap_atomic(obj->pages[reloc.offset >> PAGE_SHIFT], KM_USER0);
+                        vaddr = kmap_atomic(obj->pages[reloc.offset >> PAGE_SHIFT]);
                         *(uint32_t *)(vaddr + page_offset) = reloc.delta;
-                        kunmap_atomic(vaddr, KM_USER0);
+                        kunmap_atomic(vaddr);
                 } else {
                         uint32_t __iomem *reloc_entry;
                         void __iomem *reloc_page;
@@ -3409,12 +3409,11 @@ i915_gem_execbuffer_relocate(struct drm_i915_gem_object *obj,
                         /* Map the page containing the relocation we're going to perform.  */
                         reloc.offset += obj->gtt_offset;
                         reloc_page = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
-                                                              reloc.offset & PAGE_MASK,
-                                                              KM_USER0);
+                                                              reloc.offset & PAGE_MASK);
                         reloc_entry = (uint32_t __iomem *)
                                 (reloc_page + (reloc.offset & ~PAGE_MASK));
                         iowrite32(reloc.delta, reloc_entry);
-                        io_mapping_unmap_atomic(reloc_page, KM_USER0);
+                        io_mapping_unmap_atomic(reloc_page);
                 }
 
                 /* and update the user's relocation entry */
@@ -4776,11 +4775,11 @@ void i915_gem_detach_phys_object(struct drm_device *dev,
         page_count = obj->size / PAGE_SIZE;
 
         for (i = 0; i < page_count; i++) {
-                char *dst = kmap_atomic(obj_priv->pages[i], KM_USER0);
+                char *dst = kmap_atomic(obj_priv->pages[i]);
                 char *src = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
 
                 memcpy(dst, src, PAGE_SIZE);
-                kunmap_atomic(dst, KM_USER0);
+                kunmap_atomic(dst);
         }
         drm_clflush_pages(obj_priv->pages, page_count);
         drm_agp_chipset_flush(dev);
@@ -4837,11 +4836,11 @@ i915_gem_attach_phys_object(struct drm_device *dev,
         page_count = obj->size / PAGE_SIZE;
 
         for (i = 0; i < page_count; i++) {
-                char *src = kmap_atomic(obj_priv->pages[i], KM_USER0);
+                char *src = kmap_atomic(obj_priv->pages[i]);
                 char *dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
 
                 memcpy(dst, src, PAGE_SIZE);
-                kunmap_atomic(src, KM_USER0);
+                kunmap_atomic(src);
         }
 
         i915_gem_object_put_pages(obj);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 237b8bdb599..729fd0c91d7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -456,10 +456,9 @@ i915_error_object_create(struct drm_device *dev,
 
                 local_irq_save(flags);
                 s = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
-                                             reloc_offset,
-                                             KM_IRQ0);
+                                             reloc_offset);
                 memcpy_fromio(d, s, PAGE_SIZE);
-                io_mapping_unmap_atomic(s, KM_IRQ0);
+                io_mapping_unmap_atomic(s);
                 local_irq_restore(flags);
 
                 dst->pages[page] = d;
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 375316a8420..afb96d25219 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1465,28 +1465,25 @@ struct intel_overlay_error_state {
 };
 
 static struct overlay_registers *
-intel_overlay_map_regs_atomic(struct intel_overlay *overlay,
-                              int slot)
+intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
 {
-        drm_i915_private_t *dev_priv = overlay->dev->dev_private;
+        drm_i915_private_t *dev_priv = overlay->dev->dev_private;
         struct overlay_registers *regs;
 
         if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
                 regs = overlay->reg_bo->phys_obj->handle->vaddr;
         else
                 regs = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
-                                                overlay->reg_bo->gtt_offset,
-                                                slot);
+                                                overlay->reg_bo->gtt_offset);
 
         return regs;
 }
 
 static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay,
-                                            int slot,
                                             struct overlay_registers *regs)
 {
         if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
-                io_mapping_unmap_atomic(regs, slot);
+                io_mapping_unmap_atomic(regs);
 }
 
 
@@ -1512,12 +1509,12 @@ intel_overlay_capture_error_state(struct drm_device *dev)
         else
                 error->base = (long) overlay->reg_bo->gtt_offset;
 
-        regs = intel_overlay_map_regs_atomic(overlay, KM_IRQ0);
+        regs = intel_overlay_map_regs_atomic(overlay);
         if (!regs)
                 goto err;
 
         memcpy_fromio(&error->regs, regs, sizeof(struct overlay_registers));
-        intel_overlay_unmap_regs_atomic(overlay, KM_IRQ0, regs);
+        intel_overlay_unmap_regs_atomic(overlay, regs);
 
         return error;
 
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 65ea42cf179..0aaf5f67a43 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -73,6 +73,7 @@ static struct drm_driver driver = {
 #ifdef CONFIG_COMPAT
                 .compat_ioctl = mga_compat_ioctl,
 #endif
+                .llseek = noop_llseek,
         },
         .pci_driver = {
                 .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 53f4eba65cb..5f21030a293 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -2158,11 +2158,11 @@ peek_fb(struct drm_device *dev, struct io_mapping *fb,
 
         if (off < pci_resource_len(dev->pdev, 1)) {
                 uint8_t __iomem *p =
-                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
+                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
 
                 val = ioread32(p + (off & ~PAGE_MASK));
 
-                io_mapping_unmap_atomic(p, KM_USER0);
+                io_mapping_unmap_atomic(p);
         }
 
         return val;
@@ -2174,12 +2174,12 @@ poke_fb(struct drm_device *dev, struct io_mapping *fb,
 {
         if (off < pci_resource_len(dev->pdev, 1)) {
                 uint8_t __iomem *p =
-                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
+                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
 
                 iowrite32(val, p + (off & ~PAGE_MASK));
                 wmb();
 
-                io_mapping_unmap_atomic(p, KM_USER0);
+                io_mapping_unmap_atomic(p);
         }
 }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index edc4a9ab28d..90875494a65 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -406,6 +406,7 @@ static struct drm_driver driver = {
 #if defined(CONFIG_COMPAT)
                 .compat_ioctl = nouveau_compat_ioctl,
 #endif
+                .llseek = noop_llseek,
         },
         .pci_driver = {
                 .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index c77a6ba66b7..422b62fd827 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
@@ -24,7 +24,6 @@
 #define __NOUVEAU_I2C_H__
 
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
 #include "drm_dp_helper.h"
 
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 67309f84f16..18c3c71e41b 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -69,6 +69,7 @@ static struct drm_driver driver = {
 #ifdef CONFIG_COMPAT
                 .compat_ioctl = r128_compat_ioctl,
 #endif
+                .llseek = noop_llseek,
         },
         .pci_driver = {
                 .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index fcc79b5d22d..6d64a2705f1 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -268,7 +268,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
         }
         r = radeon_ib_schedule(rdev, parser.ib);
         if (r) {
-                DRM_ERROR("Faild to schedule IB !\n");
+                DRM_ERROR("Failed to schedule IB !\n");
         }
         radeon_cs_parser_fini(&parser, r);
         mutex_unlock(&rdev->cs_mutex);
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index c20669b9a6a..88e4ea92590 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -214,6 +214,7 @@ static struct drm_driver driver_old = {
 #ifdef CONFIG_COMPAT
                  .compat_ioctl = radeon_compat_ioctl,
 #endif
+                 .llseek = noop_llseek,
         },
 
         .pci_driver = {
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 61b9243db21..92457163d07 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -37,7 +37,6 @@
 #include <drm_fixed.h>
 #include <drm_crtc_helper.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
 
 struct radeon_bo;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 0921910698d..fe95bb35317 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -619,7 +619,7 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
                 return drm_mmap(filp, vma);
         }
 
-        file_priv = (struct drm_file *)filp->private_data;
+        file_priv = filp->private_data;
         rdev = file_priv->minor->dev->dev_private;
         if (rdev == NULL) {
                 return -EINVAL;
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index c0385633667..fa64d25d424 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
@@ -52,6 +52,7 @@ static struct drm_driver driver = {
                  .mmap = drm_mmap,
                  .poll = drm_poll,
                  .fasync = drm_fasync,
+                 .llseek = noop_llseek,
         },
 
         .pci_driver = {
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 4d9f311d249..4caf5d01cfd 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -80,6 +80,7 @@ static struct drm_driver driver = {
                  .mmap = drm_mmap,
                  .poll = drm_poll,
                  .fasync = drm_fasync,
+                 .llseek = noop_llseek,
         },
         .pci_driver = {
                  .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index e0768adbecc..b70fa91d761 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -50,6 +50,7 @@ static struct drm_driver driver = {
                  .mmap = drm_mmap,
                  .poll = drm_poll,
                  .fasync = drm_fasync,
+                 .llseek = noop_llseek,
         },
         .pci_driver = {
                  .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index ff358ad45aa..3106d5bcce3 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -163,7 +163,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,
         src = (void *)((unsigned long)src + (page << PAGE_SHIFT));
 
 #ifdef CONFIG_X86
-        dst = kmap_atomic_prot(d, KM_USER0, prot);
+        dst = kmap_atomic_prot(d, prot);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 dst = vmap(&d, 1, 0, prot);
@@ -176,7 +176,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,
         memcpy_fromio(dst, src, PAGE_SIZE);
 
 #ifdef CONFIG_X86
-        kunmap_atomic(dst, KM_USER0);
+        kunmap_atomic(dst);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 vunmap(dst);
@@ -199,7 +199,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
 
         dst = (void *)((unsigned long)dst + (page << PAGE_SHIFT));
 #ifdef CONFIG_X86
-        src = kmap_atomic_prot(s, KM_USER0, prot);
+        src = kmap_atomic_prot(s, prot);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 src = vmap(&s, 1, 0, prot);
@@ -212,7 +212,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
         memcpy_toio(dst, src, PAGE_SIZE);
 
 #ifdef CONFIG_X86
-        kunmap_atomic(src, KM_USER0);
+        kunmap_atomic(src);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 vunmap(src);
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 02f733db61c..e1ff4e7a6eb 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -60,6 +60,7 @@ static struct drm_driver driver = {
                 .mmap = drm_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,
+                .llseek = noop_llseek,
                 },
         .pci_driver = {
                 .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index d0ef624fbdc..10ca97ee020 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -907,6 +907,7 @@ static struct drm_driver driver = {
 #if defined(CONFIG_COMPAT)
                  .compat_ioctl = drm_compat_ioctl,
 #endif
+                 .llseek = noop_llseek,
         },
         .pci_driver = {
                  .name = VMWGFX_DRIVER_NAME,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 0fe31766e4c..635c0ffee7f 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -545,7 +545,7 @@ int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma)
         struct drm_file *file_priv;
         struct vmw_private *dev_priv;
 
-        file_priv = (struct drm_file *)filp->private_data;
+        file_priv = filp->private_data;
         dev_priv = vmw_priv(file_priv->minor->dev);
 
         if (vma->vm_pgoff != (dev_priv->mmio_start >> PAGE_SHIFT) ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
index 83123287c60..1e8eedd901e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
@@ -39,7 +39,7 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma)
                 return drm_mmap(filp, vma);
         }
 
-        file_priv = (struct drm_file *)filp->private_data;
+        file_priv = filp->private_data;
         dev_priv = vmw_priv(file_priv->minor->dev);
         return ttm_bo_mmap(filp, vma, &dev_priv->bdev);
 }
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index f366f968155..c380c65da41 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1211,6 +1211,7 @@ static const struct file_operations vga_arb_device_fops = {
         .poll = vga_arb_fpoll,
         .open = vga_arb_open,
         .release = vga_arb_release,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice vga_arb_device = {