diff options
| author | Tomi Valkeinen | 2016-06-03 12:29:59 +0200 |
|---|---|---|
| committer | Tomi Valkeinen | 2018-03-01 08:18:18 +0100 |
| commit | 46a930418544a5c28abec8dc3e0899d53381814a (patch) | |
| tree | 82491af499c6067e88797e0417320008083745fa /drivers/gpu/drm/omapdrm | |
| parent | drm/omap: set WB channel-in in wb_setup() (diff) | |
| download | kernel-qcow2-linux-46a930418544a5c28abec8dc3e0899d53381814a.tar.gz kernel-qcow2-linux-46a930418544a5c28abec8dc3e0899d53381814a.tar.xz kernel-qcow2-linux-46a930418544a5c28abec8dc3e0899d53381814a.zip | |
drm/omap: fix WBDELAYCOUNT for HDMI
For HDMI, WBDELAYCOUNT starts counting at the start of vsync, not at the
start of vfp.
This patch adjusts the wbdelay for HDMI accordingly.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dispc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index ccfafce1ea89..7398039954a5 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c @@ -2816,8 +2816,12 @@ int dispc_wb_setup(struct dispc_device *dispc, } else { int wbdelay; - wbdelay = min(vm->vfront_porch + - vm->vsync_len + vm->vback_porch, (u32)255); + if (channel_in == DSS_WB_TV_MGR) + wbdelay = min(vm->vsync_len + vm->vback_porch, + (u32)255); + else + wbdelay = min(vm->vfront_porch + + vm->vsync_len + vm->vback_porch, (u32)255); /* WBDELAYCOUNT */ REG_FLD_MOD(dispc, DISPC_OVL_ATTRIBUTES2(plane), wbdelay, 7, 0); |