8 files changed, 58 insertions, 35 deletions

diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 7bc775219f97..e5a76da86081 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1647,7 +1647,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma)
 
         vma->vm_ops = &meye_vm_ops;
         vma->vm_flags &= ~VM_IO;        /* not I/O memory */
-        vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
+        vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_private_data = (void *) (offset / gbufsize);
         meye_vm_open(vma);
 
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 66ac21d466af..a3b1a34c896d 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -455,11 +455,15 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr)
 
         win = &vout->win;
         for (i = 0; i < ovid->num_overlays; i++) {
+                struct omap_dss_device *dssdev;
+
                 ovl = ovid->overlays[i];
-                if (!ovl->manager || !ovl->manager->device)
+                dssdev = ovl->get_device(ovl);
+
+                if (!dssdev)
                         return -EINVAL;
 
-                timing = &ovl->manager->device->panel.timings;
+                timing = &dssdev->panel.timings;
 
                 outw = win->w.width;
                 outh = win->w.height;
@@ -516,8 +520,11 @@ static int omapvid_apply_changes(struct omap_vout_device *vout)
         struct omapvideo_info *ovid = &vout->vid_info;
 
         for (i = 0; i < ovid->num_overlays; i++) {
+                struct omap_dss_device *dssdev;
+
                 ovl = ovid->overlays[i];
-                if (!ovl->manager || !ovl->manager->device)
+                dssdev = ovl->get_device(ovl);
+                if (!dssdev)
                         return -EINVAL;
                 ovl->manager->apply(ovl->manager);
         }
@@ -580,12 +587,14 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus)
 
         ovid = &vout->vid_info;
         ovl = ovid->overlays[0];
-        /* get the display device attached to the overlay */
-        if (!ovl->manager || !ovl->manager->device)
-                return;
 
         mgr_id = ovl->manager->id;
-        cur_display = ovl->manager->device;
+
+        /* get the display device attached to the overlay */
+        cur_display = ovl->get_device(ovl);
+
+        if (!cur_display)
+                return;
 
         spin_lock(&vout->vbq_lock);
         do_gettimeofday(&timevalue);
@@ -911,7 +920,7 @@ static int omap_vout_mmap(struct file *file, struct vm_area_struct *vma)
 
         q->bufs[i]->baddr = vma->vm_start;
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
         vma->vm_ops = &omap_vout_vm_ops;
         vma->vm_private_data = (void *) vout;
@@ -949,7 +958,9 @@ static int omap_vout_release(struct file *file)
         /* Disable all the overlay managers connected with this interface */
         for (i = 0; i < ovid->num_overlays; i++) {
                 struct omap_overlay *ovl = ovid->overlays[i];
-                if (ovl->manager && ovl->manager->device)
+                struct omap_dss_device *dssdev = ovl->get_device(ovl);
+
+                if (dssdev)
                         ovl->disable(ovl);
         }
         /* Turn off the pipeline */
@@ -1082,14 +1093,17 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *fh,
         struct omapvideo_info *ovid;
         struct omap_video_timings *timing;
         struct omap_vout_device *vout = fh;
+        struct omap_dss_device *dssdev;
 
         ovid = &vout->vid_info;
         ovl = ovid->overlays[0];
+        /* get the display device attached to the overlay */
+        dssdev = ovl->get_device(ovl);
 
-        if (!ovl->manager || !ovl->manager->device)
+        if (!dssdev)
                 return -EINVAL;
-        /* get the display device attached to the overlay */
-        timing = &ovl->manager->device->panel.timings;
+
+        timing = &dssdev->panel.timings;
 
         vout->fbuf.fmt.height = timing->y_res;
         vout->fbuf.fmt.width = timing->x_res;
@@ -1106,6 +1120,7 @@ static int vidioc_s_fmt_vid_out(struct file *file, void *fh,
         struct omapvideo_info *ovid;
         struct omap_video_timings *timing;
         struct omap_vout_device *vout = fh;
+        struct omap_dss_device *dssdev;
 
         if (vout->streaming)
                 return -EBUSY;
@@ -1114,13 +1129,14 @@ static int vidioc_s_fmt_vid_out(struct file *file, void *fh,
 
         ovid = &vout->vid_info;
         ovl = ovid->overlays[0];
+        dssdev = ovl->get_device(ovl);
 
         /* get the display device attached to the overlay */
-        if (!ovl->manager || !ovl->manager->device) {
+        if (!dssdev) {
                 ret = -EINVAL;
                 goto s_fmt_vid_out_exit;
         }
-        timing = &ovl->manager->device->panel.timings;
+        timing = &dssdev->panel.timings;
 
         /* We dont support RGB24-packed mode if vrfb rotation
          * is enabled*/
@@ -1299,6 +1315,7 @@ static int vidioc_s_crop(struct file *file, void *fh, const struct v4l2_crop *cr
         struct omapvideo_info *ovid;
         struct omap_overlay *ovl;
         struct omap_video_timings *timing;
+        struct omap_dss_device *dssdev;
 
         if (vout->streaming)
                 return -EBUSY;
@@ -1306,13 +1323,15 @@ static int vidioc_s_crop(struct file *file, void *fh, const struct v4l2_crop *cr
         mutex_lock(&vout->lock);
         ovid = &vout->vid_info;
         ovl = ovid->overlays[0];
+        /* get the display device attached to the overlay */
+        dssdev = ovl->get_device(ovl);
 
-        if (!ovl->manager || !ovl->manager->device) {
+        if (!dssdev) {
                 ret = -EINVAL;
                 goto s_crop_err;
         }
-        /* get the display device attached to the overlay */
-        timing = &ovl->manager->device->panel.timings;
+
+        timing = &dssdev->panel.timings;
 
         if (is_rotation_90_or_270(vout)) {
                 vout->fbuf.fmt.height = timing->x_res;
@@ -1668,7 +1687,7 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
         for (j = 0; j < ovid->num_overlays; j++) {
                 struct omap_overlay *ovl = ovid->overlays[j];
 
-                if (ovl->manager && ovl->manager->device) {
+                if (ovl->get_device(ovl)) {
                         struct omap_overlay_info info;
                         ovl->get_overlay_info(ovl, &info);
                         info.paddr = addr;
@@ -1691,8 +1710,9 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
 
         for (j = 0; j < ovid->num_overlays; j++) {
                 struct omap_overlay *ovl = ovid->overlays[j];
+                struct omap_dss_device *dssdev = ovl->get_device(ovl);
 
-                if (ovl->manager && ovl->manager->device) {
+                if (dssdev) {
                         ret = ovl->enable(ovl);
                         if (ret)
                                 goto streamon_err1;
@@ -1727,8 +1747,9 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
 
         for (j = 0; j < ovid->num_overlays; j++) {
                 struct omap_overlay *ovl = ovid->overlays[j];
+                struct omap_dss_device *dssdev = ovl->get_device(ovl);
 
-                if (ovl->manager && ovl->manager->device)
+                if (dssdev)
                         ovl->disable(ovl);
         }
 
@@ -1891,8 +1912,8 @@ static int __init omap_vout_setup_video_data(struct omap_vout_device *vout)
         struct video_device *vfd;
         struct v4l2_pix_format *pix;
         struct v4l2_control *control;
-        struct omap_dss_device *display =
-                vout->vid_info.overlays[0]->manager->device;
+        struct omap_overlay *ovl = vout->vid_info.overlays[0];
+        struct omap_dss_device *display = ovl->get_device(ovl);
 
         /* set the default pix */
         pix = &vout->pix;
@@ -2207,8 +2228,10 @@ static int __init omap_vout_probe(struct platform_device *pdev)
          */
         for (i = 1; i < vid_dev->num_overlays; i++) {
                 ovl = omap_dss_get_overlay(i);
-                if (ovl->manager && ovl->manager->device) {
-                        def_display = ovl->manager->device;
+                dssdev = ovl->get_device(ovl);
+
+                if (dssdev) {
+                        def_display = dssdev;
                 } else {
                         dev_warn(&pdev->dev, "cannot find display\n");
                         def_display = NULL;
@@ -2255,8 +2278,10 @@ probe_err1:
         for (i = 1; i < vid_dev->num_overlays; i++) {
                 def_display = NULL;
                 ovl = omap_dss_get_overlay(i);
-                if (ovl->manager && ovl->manager->device)
-                        def_display = ovl->manager->device;
+                dssdev = ovl->get_device(ovl);
+
+                if (dssdev)
+                        def_display = dssdev;
 
                 if (def_display && def_display->driver)
                         def_display->driver->disable(def_display);
diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c
index 790d96cffeea..70b0bf4b2900 100644
--- a/drivers/media/platform/vino.c
+++ b/drivers/media/platform/vino.c
@@ -3950,7 +3950,7 @@ found:
 
         fb->map_count = 1;
 
-        vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
+        vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_flags &= ~VM_IO;
         vma->vm_private_data = fb;
         vma->vm_file = file;
diff --git a/drivers/media/usb/sn9c102/sn9c102_core.c b/drivers/media/usb/sn9c102/sn9c102_core.c
index 19ea780b16ff..5bfc8e2f018f 100644
--- a/drivers/media/usb/sn9c102/sn9c102_core.c
+++ b/drivers/media/usb/sn9c102/sn9c102_core.c
@@ -2126,8 +2126,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
                 return -EINVAL;
         }
 
-        vma->vm_flags |= VM_IO;
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 
         pos = cam->frame[i].bufmem;
         while (size > 0) { /* size is page-aligned */
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index f67018ed3795..5c36a57e6590 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -1108,8 +1108,7 @@ static int usbvision_mmap(struct file *file, struct vm_area_struct *vma)
         }
 
         /* VM_IO is eventually going to replace PageReserved altogether */
-        vma->vm_flags |= VM_IO;
-        vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
+        vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 
         pos = usbvision->frame[i].data;
         while (size > 0) {
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
index f300deafd268..828e7c10bd70 100644
--- a/drivers/media/v4l2-core/videobuf-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
@@ -582,7 +582,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
         map->count    = 1;
         map->q        = q;
         vma->vm_ops   = &videobuf_vm_ops;
-        vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
+        vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */
         vma->vm_private_data = map;
         dprintk(1, "mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n",
diff --git a/drivers/media/v4l2-core/videobuf-vmalloc.c b/drivers/media/v4l2-core/videobuf-vmalloc.c
index df142580e44c..2ff7fcc77b11 100644
--- a/drivers/media/v4l2-core/videobuf-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf-vmalloc.c
@@ -270,7 +270,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
         }
 
         vma->vm_ops          = &videobuf_vm_ops;
-        vma->vm_flags       |= VM_DONTEXPAND | VM_RESERVED;
+        vma->vm_flags       |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_private_data = map;
 
         dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n",
diff --git a/drivers/media/v4l2-core/videobuf2-memops.c b/drivers/media/v4l2-core/videobuf2-memops.c
index 504cd4cbe29e..051ea3571b20 100644
--- a/drivers/media/v4l2-core/videobuf2-memops.c
+++ b/drivers/media/v4l2-core/videobuf2-memops.c
@@ -163,7 +163,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
                 return ret;
         }
 
-        vma->vm_flags           |= VM_DONTEXPAND | VM_RESERVED;
+        vma->vm_flags           |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_private_data    = priv;
         vma->vm_ops             = vm_ops;