xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/omap: Change the types of struct omap_video_timings members

Browse Source 
omap_video_timings struct have the same members as struct videomode, but
their types are different. As first step change the types of the
omap_video_timings struct members to match their counterpart in
struct videomode to catch any type cast related issues.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Peter Ujfalusi
2016-09-22 14:07:02 +03:00
committed by Tomi Valkeinen
parent d34afb73c3
commit 7aa91e76ae
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
View File

@@ -1023,7 +1023,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,
goto err1; goto err1;
} }
size = min(w * h * 3, size = min((u32)w * h * 3,
dssdev->panel.timings.hactive * dssdev->panel.timings.hactive *
dssdev->panel.timings.vactive * 3); dssdev->panel.timings.vactive * 3);

5
drivers/gpu/drm/omapdrm/dss/dispc.c
View File

@@ -2870,7 +2870,8 @@ int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
int wbdelay; int wbdelay;
wbdelay = min(mgr_timings->vfront_porch + 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 */ /* WBDELAYCOUNT */
REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), wbdelay, 7, 0); 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; ht = timings->pixelclock / xtot;
vt = timings->pixelclock / xtot / ytot; 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", 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.hsync_len, t.hfront_porch, t.hback_porch,
t.vsync_len, t.vfront_porch, t.vback_porch); t.vsync_len, t.vfront_porch, t.vback_porch);

2
drivers/gpu/drm/omapdrm/dss/dpi.c
View File

@@ -351,7 +351,7 @@ static int dpi_set_mode(struct dpi_data *dpi)
pck = fck / lck_div / pck_div; pck = fck / lck_div / pck_div;
if (pck != t->pixelclock) { 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);
t->pixelclock = pck; t->pixelclock = pck;

18
drivers/gpu/drm/omapdrm/dss/omapdss.h
View File

@@ -301,23 +301,23 @@ struct omap_dss_dsi_config {
struct omap_video_timings { struct omap_video_timings {
/* Unit: pixels */ /* Unit: pixels */
u16 hactive; u32 hactive;
/* Unit: pixels */ /* Unit: pixels */
u16 vactive; u32 vactive;
/* Unit: Hz */ /* Unit: Hz */
u32 pixelclock; unsigned long pixelclock;
/* Unit: pixel clocks */ /* Unit: pixel clocks */
u16 hsync_len; /* Horizontal synchronization pulse width */ u32 hsync_len; /* Horizontal synchronization pulse width */
/* Unit: pixel clocks */ /* Unit: pixel clocks */
u16 hfront_porch; /* Horizontal front porch */ u32 hfront_porch; /* Horizontal front porch */
/* Unit: pixel clocks */ /* Unit: pixel clocks */
u16 hback_porch; /* Horizontal back porch */ u32 hback_porch; /* Horizontal back porch */
/* Unit: line clocks */ /* Unit: line clocks */
u16 vsync_len; /* Vertical synchronization pulse width */ u32 vsync_len; /* Vertical synchronization pulse width */
/* Unit: line clocks */ /* Unit: line clocks */
u16 vfront_porch; /* Vertical front porch */ u32 vfront_porch; /* Vertical front porch */
/* Unit: line clocks */ /* Unit: line clocks */
u16 vback_porch; /* Vertical back porch */ u32 vback_porch; /* Vertical back porch */
enum display_flags flags; enum display_flags flags;
}; };

2
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@@ -162,7 +162,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
pck = fck / dispc_cinfo.lck_div / dispc_cinfo.pck_div; pck = fck / dispc_cinfo.lck_div / dispc_cinfo.pck_div;
if (pck != t->pixelclock) { 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);
t->pixelclock = pck; t->pixelclock = pck;