leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/omap: dispc: Simplify _dispc_mgr_set_lcd_timings() parameters

Browse Source 
Instead of passing the omap_video_timings structure's members individually,
use the pointer to the struct.

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:06:56 +03:00 committed by Tomi Valkeinen
parent 530582998a
commit 3b592939b7
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3141,29 +3141,23 @@ bool dispc_mgr_timings_ok(enum omap_channel channel,
return true; return true;
} }
static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsync_len, static void _dispc_mgr_set_lcd_timings(enum omap_channel channel,
int hfp, int hbp, int vsw, int vfp, int vbp, const struct omap_video_timings *ovt)
enum omap_dss_signal_level vsync_level,
enum omap_dss_signal_level hsync_level,
enum omap_dss_signal_edge data_pclk_edge,
enum omap_dss_signal_level de_level,
enum omap_dss_signal_edge sync_pclk_edge)
{ {
u32 timing_h, timing_v, l; u32 timing_h, timing_v, l;
bool onoff, rf, ipc, vs, hs, de; bool onoff, rf, ipc, vs, hs, de;
timing_h = FLD_VAL(hsync_len-1, dispc.feat->sw_start, 0) | timing_h = FLD_VAL(ovt->hsync_len - 1, dispc.feat->sw_start, 0) |
FLD_VAL(hfp-1, dispc.feat->fp_start, 8) | FLD_VAL(ovt->hfront_porch - 1, dispc.feat->fp_start, 8) |
FLD_VAL(hbp-1, dispc.feat->bp_start, 20); FLD_VAL(ovt->hback_porch - 1, dispc.feat->bp_start, 20);
timing_v = FLD_VAL(vsw-1, dispc.feat->sw_start, 0) | timing_v = FLD_VAL(ovt->vsync_len - 1, dispc.feat->sw_start, 0) |
FLD_VAL(vfp, dispc.feat->fp_start, 8) | FLD_VAL(ovt->vfront_porch, dispc.feat->fp_start, 8) |
FLD_VAL(vbp, dispc.feat->bp_start, 20); FLD_VAL(ovt->vback_porch, dispc.feat->bp_start, 20);
dispc_write_reg(DISPC_TIMING_H(channel), timing_h); dispc_write_reg(DISPC_TIMING_H(channel), timing_h);
dispc_write_reg(DISPC_TIMING_V(channel), timing_v); dispc_write_reg(DISPC_TIMING_V(channel), timing_v);
switch (vsync_level) { switch (ovt->vsync_level) {
case OMAPDSS_SIG_ACTIVE_LOW: case OMAPDSS_SIG_ACTIVE_LOW:
vs = true; vs = true;
break; break;
@ -3174,7 +3168,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsync_len,
BUG(); BUG();
} }
switch (hsync_level) { switch (ovt->hsync_level) {
case OMAPDSS_SIG_ACTIVE_LOW: case OMAPDSS_SIG_ACTIVE_LOW:
hs = true; hs = true;
break; break;
@ -3185,7 +3179,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsync_len,
BUG(); BUG();
} }
switch (de_level) { switch (ovt->de_level) {
case OMAPDSS_SIG_ACTIVE_LOW: case OMAPDSS_SIG_ACTIVE_LOW:
de = true; de = true;
break; break;
@ -3196,7 +3190,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsync_len,
BUG(); BUG();
} }
switch (data_pclk_edge) { switch (ovt->data_pclk_edge) {
case OMAPDSS_DRIVE_SIG_RISING_EDGE: case OMAPDSS_DRIVE_SIG_RISING_EDGE:
ipc = false; ipc = false;
break; break;
@ -3210,7 +3204,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsync_len,
/* always use the 'rf' setting */ /* always use the 'rf' setting */
onoff = true; onoff = true;
switch (sync_pclk_edge) { switch (ovt->sync_pclk_edge) {
case OMAPDSS_DRIVE_SIG_FALLING_EDGE: case OMAPDSS_DRIVE_SIG_FALLING_EDGE:
rf = false; rf = false;
break; break;
@ -3270,11 +3264,7 @@ void dispc_mgr_set_timings(enum omap_channel channel,
} }
if (dss_mgr_is_lcd(channel)) { if (dss_mgr_is_lcd(channel)) {
_dispc_mgr_set_lcd_timings(channel, _dispc_mgr_set_lcd_timings(channel, &t);
t.hsync_len, t.hfront_porch, t.hback_porch,
t.vsync_len, t.vfront_porch, t.vback_porch,
t.vsync_level, t.hsync_level, t.data_pclk_edge,
t.de_level, t.sync_pclk_edge);
xtot = t.hactive + t.hfront_porch + t.hsync_len + t.hback_porch; xtot = t.hactive + t.hfront_porch + t.hsync_len + t.hback_porch;
ytot = t.vactive + t.vfront_porch + t.vsync_len + t.vback_porch; ytot = t.vactive + t.vfront_porch + t.vsync_len + t.vback_porch;