Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

[can-eth-gw-linux.git] / drivers / media / platform / omap / omap_vout.c

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 134016f0e660dce4e76ad9cd8e13b184ea49d563..a3b1a34c896db9257000f6c1a3e8fb8bb7cd7df0 100644 (file)
--- 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);
@@ -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);