7 files changed, 133 insertions, 42 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 355157e4f78d..e3c47a8005ff 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -33,6 +33,7 @@ struct omap_crtc {
         int pipe;
         enum omap_channel channel;
         struct omap_overlay_manager_info info;
+        struct drm_encoder *current_encoder;
 
         /*
          * Temporary: eventually this will go away, but it is needed
@@ -120,13 +121,25 @@ static void omap_crtc_start_update(struct omap_overlay_manager *mgr)
 {
 }
 
+static void set_enabled(struct drm_crtc *crtc, bool enable);
+
 static int omap_crtc_enable(struct omap_overlay_manager *mgr)
 {
+        struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
+
+        dispc_mgr_setup(omap_crtc->channel, &omap_crtc->info);
+        dispc_mgr_set_timings(omap_crtc->channel,
+                        &omap_crtc->timings);
+        set_enabled(&omap_crtc->base, true);
+
         return 0;
 }
 
 static void omap_crtc_disable(struct omap_overlay_manager *mgr)
 {
+        struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
+
+        set_enabled(&omap_crtc->base, false);
 }
 
 static void omap_crtc_set_timings(struct omap_overlay_manager *mgr,
@@ -184,7 +197,6 @@ static void omap_crtc_destroy(struct drm_crtc *crtc)
         WARN_ON(omap_crtc->apply_irq.registered);
         omap_irq_unregister(crtc->dev, &omap_crtc->error_irq);
 
-        omap_crtc->plane->funcs->destroy(omap_crtc->plane);
         drm_crtc_cleanup(crtc);
 
         kfree(omap_crtc);
@@ -338,17 +350,23 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
         struct drm_plane *primary = crtc->primary;
         struct drm_gem_object *bo;
+        unsigned long flags;
 
         DBG("%d -> %d (event=%p)", primary->fb ? primary->fb->base.id : -1,
                         fb->base.id, event);
 
+        spin_lock_irqsave(&dev->event_lock, flags);
+
         if (omap_crtc->old_fb) {
+                spin_unlock_irqrestore(&dev->event_lock, flags);
                 dev_err(dev->dev, "already a pending flip\n");
                 return -EINVAL;
         }
 
         omap_crtc->event = event;
-        primary->fb = fb;
+        omap_crtc->old_fb = primary->fb = fb;
+
+        spin_unlock_irqrestore(&dev->event_lock, flags);
 
         /*
          * Hold a reference temporarily until the crtc is updated
@@ -528,38 +546,46 @@ static void set_enabled(struct drm_crtc *crtc, bool enable)
         struct drm_device *dev = crtc->dev;
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
         enum omap_channel channel = omap_crtc->channel;
-        struct omap_irq_wait *wait = NULL;
+        struct omap_irq_wait *wait;
+        u32 framedone_irq, vsync_irq;
+        int ret;
 
         if (dispc_mgr_is_enabled(channel) == enable)
                 return;
 
-        /* ignore sync-lost irqs during enable/disable */
+        /*
+         * Digit output produces some sync lost interrupts during the first
+         * frame when enabling, so we need to ignore those.
+         */
         omap_irq_unregister(crtc->dev, &omap_crtc->error_irq);
 
-        if (dispc_mgr_get_framedone_irq(channel)) {
-                if (!enable) {
-                        wait = omap_irq_wait_init(dev,
-                                        dispc_mgr_get_framedone_irq(channel), 1);
-                }
+        framedone_irq = dispc_mgr_get_framedone_irq(channel);
+        vsync_irq = dispc_mgr_get_vsync_irq(channel);
+
+        if (enable) {
+                wait = omap_irq_wait_init(dev, vsync_irq, 1);
         } else {
                 /*
-                 * When we disable digit output, we need to wait until fields
-                 * are done.  Otherwise the DSS is still working, and turning
-                 * off the clocks prevents DSS from going to OFF mode. And when
-                 * enabling, we need to wait for the extra sync losts
+                 * When we disable the digit output, we need to wait for
+                 * FRAMEDONE to know that DISPC has finished with the output.
+                 *
+                 * OMAP2/3 does not have FRAMEDONE irq for digit output, and in
+                 * that case we need to use vsync interrupt, and wait for both
+                 * even and odd frames.
                  */
-                wait = omap_irq_wait_init(dev,
-                                dispc_mgr_get_vsync_irq(channel), 2);
+
+                if (framedone_irq)
+                        wait = omap_irq_wait_init(dev, framedone_irq, 1);
+                else
+                        wait = omap_irq_wait_init(dev, vsync_irq, 2);
         }
 
         dispc_mgr_enable(channel, enable);
 
-        if (wait) {
-                int ret = omap_irq_wait(dev, wait, msecs_to_jiffies(100));
-                if (ret) {
-                        dev_err(dev->dev, "%s: timeout waiting for %s\n",
-                                        omap_crtc->name, enable ? "enable" : "disable");
-                }
+        ret = omap_irq_wait(dev, wait, msecs_to_jiffies(100));
+        if (ret) {
+                dev_err(dev->dev, "%s: timeout waiting for %s\n",
+                                omap_crtc->name, enable ? "enable" : "disable");
         }
 
         omap_irq_register(crtc->dev, &omap_crtc->error_irq);
@@ -586,8 +612,12 @@ static void omap_crtc_pre_apply(struct omap_drm_apply *apply)
                 }
         }
 
+        if (omap_crtc->current_encoder && encoder != omap_crtc->current_encoder)
+                omap_encoder_set_enabled(omap_crtc->current_encoder, false);
+
+        omap_crtc->current_encoder = encoder;
+
         if (!omap_crtc->enabled) {
-                set_enabled(&omap_crtc->base, false);
                 if (encoder)
                         omap_encoder_set_enabled(encoder, false);
         } else {
@@ -596,13 +626,7 @@ static void omap_crtc_pre_apply(struct omap_drm_apply *apply)
                         omap_encoder_update(encoder, omap_crtc->mgr,
                                         &omap_crtc->timings);
                         omap_encoder_set_enabled(encoder, true);
-                        omap_crtc->full_update = false;
                 }
-
-                dispc_mgr_setup(omap_crtc->channel, &omap_crtc->info);
-                dispc_mgr_set_timings(omap_crtc->channel,
-                                &omap_crtc->timings);
-                set_enabled(&omap_crtc->base, true);
         }
 
         omap_crtc->full_update = false;
@@ -613,10 +637,30 @@ static void omap_crtc_post_apply(struct omap_drm_apply *apply)
         /* nothing needed for post-apply */
 }
 
+void omap_crtc_flush(struct drm_crtc *crtc)
+{
+        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+        int loops = 0;
+
+        while (!list_empty(&omap_crtc->pending_applies) ||
+                !list_empty(&omap_crtc->queued_applies) ||
+                omap_crtc->event || omap_crtc->old_fb) {
+
+                if (++loops > 10) {
+                        dev_err(crtc->dev->dev,
+                                "omap_crtc_flush() timeout\n");
+                        break;
+                }
+
+                schedule_timeout_uninterruptible(msecs_to_jiffies(20));
+        }
+}
+
 static const char *channel_names[] = {
                 [OMAP_DSS_CHANNEL_LCD] = "lcd",
                 [OMAP_DSS_CHANNEL_DIGIT] = "tv",
                 [OMAP_DSS_CHANNEL_LCD2] = "lcd2",
+                [OMAP_DSS_CHANNEL_LCD3] = "lcd3",
 };
 
 void omap_crtc_pre_init(void)
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index bf39fcc49e0f..c8270e4b26f3 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -513,12 +513,18 @@ static int dev_load(struct drm_device *dev, unsigned long flags)
 static int dev_unload(struct drm_device *dev)
 {
         struct omap_drm_private *priv = dev->dev_private;
+        int i;
 
         DBG("unload: dev=%p", dev);
 
         drm_kms_helper_poll_fini(dev);
 
         omap_fbdev_free(dev);
+
+        /* flush crtcs so the fbs get released */
+        for (i = 0; i < priv->num_crtcs; i++)
+                omap_crtc_flush(priv->crtcs[i]);
+
         omap_modeset_free(dev);
         omap_gem_deinit(dev);
 
@@ -696,10 +702,11 @@ static int pdev_remove(struct platform_device *device)
 {
         DBG("");
 
+        drm_put_dev(platform_get_drvdata(device));
+
         omap_disconnect_dssdevs();
         omap_crtc_pre_uninit();
 
-        drm_put_dev(platform_get_drvdata(device));
         return 0;
 }
 
@@ -726,18 +733,33 @@ static struct platform_driver pdev = {
 
 static int __init omap_drm_init(void)
 {
+        int r;
+
         DBG("init");
-        if (platform_driver_register(&omap_dmm_driver)) {
-                /* we can continue on without DMM.. so not fatal */
-                dev_err(NULL, "DMM registration failed\n");
+
+        r = platform_driver_register(&omap_dmm_driver);
+        if (r) {
+                pr_err("DMM driver registration failed\n");
+                return r;
+        }
+
+        r = platform_driver_register(&pdev);
+        if (r) {
+                pr_err("omapdrm driver registration failed\n");
+                platform_driver_unregister(&omap_dmm_driver);
+                return r;
         }
-        return platform_driver_register(&pdev);
+
+        return 0;
 }
 
 static void __exit omap_drm_fini(void)
 {
         DBG("fini");
+
         platform_driver_unregister(&pdev);
+
+        platform_driver_unregister(&omap_dmm_driver);
 }
 
 /* need late_initcall() so we load after dss_driver's are loaded */
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 428b2981fd68..284b80fc3c54 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -163,6 +163,7 @@ void omap_crtc_pre_init(void);
 void omap_crtc_pre_uninit(void);
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct drm_plane *plane, enum omap_channel channel, int id);
+void omap_crtc_flush(struct drm_crtc *crtc);
 
 struct drm_plane *omap_plane_init(struct drm_device *dev,
                 int plane_id, bool private_plane);
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index d2b8c49bfb4a..8b019602ffe6 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -218,6 +218,20 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
                 info->rotation_type = OMAP_DSS_ROT_TILER;
                 info->screen_width  = omap_gem_tiled_stride(plane->bo, orient);
         } else {
+                switch (win->rotation & 0xf) {
+                case 0:
+                case BIT(DRM_ROTATE_0):
+                        /* OK */
+                        break;
+
+                default:
+                        dev_warn(fb->dev->dev,
+                                "rotation '%d' ignored for non-tiled fb\n",
+                                win->rotation);
+                        win->rotation = 0;
+                        break;
+                }
+
                 info->paddr         = get_linear_addr(plane, format, 0, x, y);
                 info->rotation_type = OMAP_DSS_ROT_DMA;
                 info->screen_width  = plane->pitch;
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 002988d09021..1388ca7f87e8 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -371,6 +371,9 @@ void omap_fbdev_free(struct drm_device *dev)
 
         fbdev = to_omap_fbdev(priv->fbdev);
 
+        /* release the ref taken in omap_fbdev_create() */
+        omap_gem_put_paddr(fbdev->bo);
+
         /* this will free the backing object */
         if (fbdev->fb) {
                 drm_framebuffer_unregister_private(fbdev->fb);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index c8d972763889..95dbce286a41 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -980,12 +980,9 @@ int omap_gem_resume(struct device *dev)
 #ifdef CONFIG_DEBUG_FS
 void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
 {
-        struct drm_device *dev = obj->dev;
         struct omap_gem_object *omap_obj = to_omap_bo(obj);
         uint64_t off;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-
         off = drm_vma_node_start(&obj->vma_node);
 
         seq_printf(m, "%08x: %2d (%2d) %08llx %08Zx (%2d) %p %4d",
@@ -1050,10 +1047,10 @@ static inline bool is_waiting(struct omap_gem_sync_waiter *waiter)
 {
         struct omap_gem_object *omap_obj = waiter->omap_obj;
         if ((waiter->op & OMAP_GEM_READ) &&
-                        (omap_obj->sync->read_complete < waiter->read_target))
+                        (omap_obj->sync->write_complete < waiter->write_target))
                 return true;
         if ((waiter->op & OMAP_GEM_WRITE) &&
-                        (omap_obj->sync->write_complete < waiter->write_target))
+                        (omap_obj->sync->read_complete < waiter->read_target))
                 return true;
         return false;
 }
@@ -1229,6 +1226,8 @@ int omap_gem_op_async(struct drm_gem_object *obj, enum omap_gem_op op,
                 }
 
                 spin_unlock(&sync_lock);
+
+                kfree(waiter);
         }
 
         /* no waiting.. */
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 046d5e660c04..3cf31ee59aac 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -225,6 +225,11 @@ int omap_plane_mode_set(struct drm_plane *plane,
                 omap_plane->apply_done_cb.arg = arg;
         }
 
+        if (plane->fb)
+                drm_framebuffer_unreference(plane->fb);
+
+        drm_framebuffer_reference(fb);
+
         plane->fb = fb;
         plane->crtc = crtc;
 
@@ -241,10 +246,13 @@ static int omap_plane_update(struct drm_plane *plane,
         struct omap_plane *omap_plane = to_omap_plane(plane);
         omap_plane->enabled = true;
 
-        if (plane->fb)
-                drm_framebuffer_unreference(plane->fb);
-
-        drm_framebuffer_reference(fb);
+        /* omap_plane_mode_set() takes adjusted src */
+        switch (omap_plane->win.rotation & 0xf) {
+        case BIT(DRM_ROTATE_90):
+        case BIT(DRM_ROTATE_270):
+                swap(src_w, src_h);
+                break;
+        }
 
         return omap_plane_mode_set(plane, crtc, fb,
                         crtc_x, crtc_y, crtc_w, crtc_h,