Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16bf20c7 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DISPC: remove struct omap_overlay use 



dispc_ovl_setup() uses struct omap_overlay to get the caps for the
overlay. We can change the code to get the caps directly from dss
features, thus removing the dependency to struct omap_overlay.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 881c98ff

drivers/video/omap2/dss/dispc.c

+2 −2
Original line number Diff line number Diff line
@@ -2504,7 +2504,7 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, 
		bool mem_to_mem)

{

	int r;

	const struct omap_overlay *ovl = omap_dss_get_overlay(plane);

	enum omap_overlay_caps caps = dss_feat_get_overlay_caps(plane);

	enum omap_channel channel;



	channel = dispc_ovl_get_channel_out(plane);
@@ -2515,7 +2515,7 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, 
		oi->pos_y, oi->width, oi->height, oi->out_width, oi->out_height,

		oi->color_mode, oi->rotation, oi->mirror, channel, replication);



	r = dispc_ovl_setup_common(plane, ovl->caps, oi->paddr, oi->p_uv_addr,

	r = dispc_ovl_setup_common(plane, caps, oi->paddr, oi->p_uv_addr,

		oi->screen_width, oi->pos_x, oi->pos_y, oi->width, oi->height,

		oi->out_width, oi->out_height, oi->color_mode, oi->rotation,

		oi->mirror, oi->zorder, oi->pre_mult_alpha, oi->global_alpha,