2 files changed, 43 insertions, 47 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 39693dfe54af..62928ec0e7db 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -420,8 +420,6 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
         struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-        struct videomode *vm = &omap_crtc->vm;
-        struct omap_dss_device *dssdev;
 
         DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
             omap_crtc->name, mode->base.id, mode->name,
@@ -430,45 +428,7 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
             mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal,
             mode->type, mode->flags);
 
-        drm_display_mode_to_videomode(mode, vm);
-
-        /*
-         * HACK: This fixes the vm flags.
-         * struct drm_display_mode does not contain the VSYNC/HSYNC/DE flags
-         * and they get lost when converting back and forth between
-         * struct drm_display_mode and struct videomode. The hack below
-         * goes and fetches the missing flags from the panel drivers.
-         *
-         * A better solution is to use DRM's bus-flags through the whole driver.
-         */
-
-        for (dssdev = omap_crtc->pipe->output; dssdev; dssdev = dssdev->next) {
-                unsigned long bus_flags = dssdev->bus_flags;
-
-                if (!(vm->flags & (DISPLAY_FLAGS_DE_LOW |
-                                   DISPLAY_FLAGS_DE_HIGH))) {
-                        if (bus_flags & DRM_BUS_FLAG_DE_LOW)
-                                vm->flags |= DISPLAY_FLAGS_DE_LOW;
-                        else if (bus_flags & DRM_BUS_FLAG_DE_HIGH)
-                                vm->flags |= DISPLAY_FLAGS_DE_HIGH;
-                }
-
-                if (!(vm->flags & (DISPLAY_FLAGS_PIXDATA_POSEDGE |
-                                   DISPLAY_FLAGS_PIXDATA_NEGEDGE))) {
-                        if (bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
-                                vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
-                        else if (bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
-                                vm->flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
-                }
-
-                if (!(vm->flags & (DISPLAY_FLAGS_SYNC_POSEDGE |
-                                   DISPLAY_FLAGS_SYNC_NEGEDGE))) {
-                        if (bus_flags & DRM_BUS_FLAG_SYNC_POSEDGE)
-                                vm->flags |= DISPLAY_FLAGS_SYNC_POSEDGE;
-                        else if (bus_flags & DRM_BUS_FLAG_SYNC_NEGEDGE)
-                                vm->flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
-                }
-        }
+        drm_display_mode_to_videomode(mode, &omap_crtc->vm);
 }
 
 static int omap_crtc_atomic_check(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index bb010c20d8b8..82cdcba961a8 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -103,13 +103,49 @@ static int omap_encoder_update(struct drm_encoder *encoder,
         int ret;
 
         for (dssdev = omap_encoder->output; dssdev; dssdev = dssdev->next) {
-                if (!dssdev->ops->check_timings)
-                        continue;
+                unsigned long bus_flags = dssdev->bus_flags;
+
+                if (dssdev->ops->check_timings) {
+                        ret = dssdev->ops->check_timings(dssdev, vm);
+                        if (ret) {
+                                dev_err(dev->dev, "invalid timings: %d\n", ret);
+                                return ret;
+                        }
+                }
+
+                /*
+                 * HACK: This fixes the vm flags.
+                 * struct drm_display_mode does not contain the VSYNC/HSYNC/DE
+                 * flags and they get lost when converting back and forth
+                 * between struct drm_display_mode and struct videomode. The
+                 * hack below goes and fetches the missing flags.
+                 *
+                 * A better solution is to use DRM's bus-flags through the whole
+                 * driver.
+                 */
+
+                if (!(vm->flags & (DISPLAY_FLAGS_DE_LOW |
+                                   DISPLAY_FLAGS_DE_HIGH))) {
+                        if (bus_flags & DRM_BUS_FLAG_DE_LOW)
+                                vm->flags |= DISPLAY_FLAGS_DE_LOW;
+                        else if (bus_flags & DRM_BUS_FLAG_DE_HIGH)
+                                vm->flags |= DISPLAY_FLAGS_DE_HIGH;
+                }
+
+                if (!(vm->flags & (DISPLAY_FLAGS_PIXDATA_POSEDGE |
+                                   DISPLAY_FLAGS_PIXDATA_NEGEDGE))) {
+                        if (bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
+                                vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
+                        else if (bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+                                vm->flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
+                }
 
-                ret = dssdev->ops->check_timings(dssdev, vm);
-                if (ret) {
-                        dev_err(dev->dev, "invalid timings: %d\n", ret);
-                        return ret;
+                if (!(vm->flags & (DISPLAY_FLAGS_SYNC_POSEDGE |
+                                   DISPLAY_FLAGS_SYNC_NEGEDGE))) {
+                        if (bus_flags & DRM_BUS_FLAG_SYNC_POSEDGE)
+                                vm->flags |= DISPLAY_FLAGS_SYNC_POSEDGE;
+                        else if (bus_flags & DRM_BUS_FLAG_SYNC_NEGEDGE)
+                                vm->flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
                 }
         }