5 files changed, 15 insertions, 14 deletions

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index c3d2a12358fa..8f676b8ac038 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1023,7 +1023,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,
                 goto err1;
         }
 
-        size = min(w * h * 3,
+        size = min((u32)w * h * 3,
                         dssdev->panel.timings.hactive *
                         dssdev->panel.timings.vactive * 3);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 83b7a7a2a9e7..63d3dc44913c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2870,7 +2870,8 @@ int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
                 int wbdelay;
 
                 wbdelay = min(mgr_timings->vfront_porch +
-                              mgr_timings->vsync_len + mgr_timings->vback_porch, 255);
+                              mgr_timings->vsync_len + mgr_timings->vback_porch,
+                              (u32)255);
 
                 /* WBDELAYCOUNT */
                 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), wbdelay, 7, 0);
@@ -3242,7 +3243,7 @@ void dispc_mgr_set_timings(enum omap_channel channel,
                 ht = timings->pixelclock / xtot;
                 vt = timings->pixelclock / xtot / ytot;
 
-                DSSDBG("pck %u\n", timings->pixelclock);
+                DSSDBG("pck %lu\n", timings->pixelclock);
                 DSSDBG("hsync_len %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
                         t.hsync_len, t.hfront_porch, t.hback_porch,
                         t.vsync_len, t.vfront_porch, t.vback_porch);
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index d653f492cbfd..8fb40efa65af 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -351,7 +351,7 @@ static int dpi_set_mode(struct dpi_data *dpi)
         pck = fck / lck_div / pck_div;
 
         if (pck != t->pixelclock) {
-                DSSWARN("Could not find exact pixel clock. Requested %d Hz, got %lu Hz\n",
+                DSSWARN("Could not find exact pixel clock. Requested %lu Hz, got %lu Hz\n",
                         t->pixelclock, pck);
 
                 t->pixelclock = pck;
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 84d34242d5a4..bd38da3af01f 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -301,23 +301,23 @@ struct omap_dss_dsi_config {
 
 struct omap_video_timings {
         /* Unit: pixels */
-        u16 hactive;
+        u32 hactive;
         /* Unit: pixels */
-        u16 vactive;
+        u32 vactive;
         /* Unit: Hz */
-        u32 pixelclock;
+        unsigned long pixelclock;
         /* Unit: pixel clocks */
-        u16 hsync_len;          /* Horizontal synchronization pulse width */
+        u32 hsync_len;          /* Horizontal synchronization pulse width */
         /* Unit: pixel clocks */
-        u16 hfront_porch;       /* Horizontal front porch */
+        u32 hfront_porch;       /* Horizontal front porch */
         /* Unit: pixel clocks */
-        u16 hback_porch;        /* Horizontal back porch */
+        u32 hback_porch;        /* Horizontal back porch */
         /* Unit: line clocks */
-        u16 vsync_len;          /* Vertical synchronization pulse width */
+        u32 vsync_len;          /* Vertical synchronization pulse width */
         /* Unit: line clocks */
-        u16 vfront_porch;       /* Vertical front porch */
+        u32 vfront_porch;       /* Vertical front porch */
         /* Unit: line clocks */
-        u16 vback_porch;        /* Vertical back porch */
+        u32 vback_porch;        /* Vertical back porch */
 
         enum display_flags flags;
 };
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 3b076329a3ac..c8658f97ab7d 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -162,7 +162,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
         pck = fck / dispc_cinfo.lck_div / dispc_cinfo.pck_div;
 
         if (pck != t->pixelclock) {
-                DSSWARN("Could not find exact pixel clock. Requested %d Hz, got %lu Hz\n",
+                DSSWARN("Could not find exact pixel clock. Requested %lu Hz, got %lu Hz\n",
                         t->pixelclock, pck);
 
                 t->pixelclock = pck;