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

Commit 3bce5f43 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: remove dispc_ovl_check() 



dispc_ovl_check() is not used anywhere, so it can be removed.

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

drivers/gpu/drm/omapdrm/dss/dispc.c

+0 −41
Original line number Original line Diff line number Diff line
@@ -2561,47 +2561,6 @@ static int dispc_ovl_calc_scaling(unsigned long pclk, unsigned long lclk, 
	return 0;

	return 0;

}

}





int dispc_ovl_check(enum omap_plane plane, enum omap_channel channel,

		const struct omap_overlay_info *oi,

		const struct omap_video_timings *timings,

		int *x_predecim, int *y_predecim)

{

	enum omap_overlay_caps caps = dss_feat_get_overlay_caps(plane);

	bool five_taps = true;

	bool fieldmode = false;

	u16 in_height = oi->height;

	u16 in_width = oi->width;

	bool ilace = timings->interlace;

	u16 out_width, out_height;

	int pos_x = oi->pos_x;

	unsigned long pclk = dispc_mgr_pclk_rate(channel);

	unsigned long lclk = dispc_mgr_lclk_rate(channel);



	out_width = oi->out_width == 0 ? oi->width : oi->out_width;

	out_height = oi->out_height == 0 ? oi->height : oi->out_height;



	if (ilace && oi->height == out_height)

		fieldmode = true;



	if (ilace) {

		if (fieldmode)

			in_height /= 2;

		out_height /= 2;



		DSSDBG("adjusting for ilace: height %d, out_height %d\n",

				in_height, out_height);

	}



	if (!dss_feat_color_mode_supported(plane, oi->color_mode))

		return -EINVAL;



	return dispc_ovl_calc_scaling(pclk, lclk, caps, timings, in_width,

			in_height, out_width, out_height, oi->color_mode,

			&five_taps, x_predecim, y_predecim, pos_x,

			oi->rotation_type, false);

}

EXPORT_SYMBOL(dispc_ovl_check);



static int dispc_ovl_setup_common(enum omap_plane plane,

static int dispc_ovl_setup_common(enum omap_plane plane,

		enum omap_overlay_caps caps, u32 paddr, u32 p_uv_addr,

		enum omap_overlay_caps caps, u32 paddr, u32 p_uv_addr,

		u16 screen_width, int pos_x, int pos_y, u16 width, u16 height,

		u16 screen_width, int pos_x, int pos_y, u16 width, u16 height,

drivers/gpu/drm/omapdrm/dss/omapdss.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -45,11 +45,6 @@ void dispc_mgr_set_timings(enum omap_channel channel, 
void dispc_mgr_setup(enum omap_channel channel,

void dispc_mgr_setup(enum omap_channel channel,

		const struct omap_overlay_manager_info *info);

		const struct omap_overlay_manager_info *info);





int dispc_ovl_check(enum omap_plane plane, enum omap_channel channel,

		const struct omap_overlay_info *oi,

		const struct omap_video_timings *timings,

		int *x_predecim, int *y_predecim);



int dispc_ovl_enable(enum omap_plane plane, bool enable);

int dispc_ovl_enable(enum omap_plane plane, bool enable);

bool dispc_ovl_enabled(enum omap_plane plane);

bool dispc_ovl_enabled(enum omap_plane plane);

void dispc_ovl_set_channel_out(enum omap_plane plane,

void dispc_ovl_set_channel_out(enum omap_plane plane,