Skip to content

Commit

Permalink
drm/omap: Add pclk setting case when channel is DSS_WB
Browse files Browse the repository at this point in the history
In dispc_set_ovl_common() we need to initialize pclk to a valid
value when we use WB in capture mode (i.e. mem_2_mem is false).
Otherwise dispc_ovl_calc_scaling() fails.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Benoit Parrot authored and Tomi Valkeinen committed Mar 1, 2018
1 parent b5d025e commit 9deb5ad
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/omapdrm/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2590,6 +2590,10 @@ static int dispc_ovl_setup_common(struct dispc_device *dispc,
unsigned long pclk = dispc_plane_pclk_rate(dispc, plane);
unsigned long lclk = dispc_plane_lclk_rate(dispc, plane);

/* when setting up WB, dispc_plane_pclk_rate() returns 0 */
if (plane == OMAP_DSS_WB)
pclk = vm->pixelclock;

if (paddr == 0 && rotation_type != OMAP_DSS_ROT_TILER)
return -EINVAL;

Expand Down

0 comments on commit 9deb5ad

Please sign in to comment.