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

Commit b917fa39 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: MANAGER: Create a function to check manager timings 



Create a function dss_mgr_check_timings() which wraps around the function
dispc_mgr_timings_ok(). This is mainly a clean up to hide dispc functions
from interface drivers.

dss_mgr_check_timings() is added in the function dss_mgr_check(), it currently
takes the timings maintained in the omap_dss_device struct. This would be later
replaced by the timings stored in the manager's private data.

Make dss_mgr_check_timings() and dispc_mgr_timings_ok() take a const
omap_video_timings pointer since these functions just check the timings.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
parent 41721163

drivers/video/omap2/dss/dispc.c

+1 −1
Original line number Diff line number Diff line
@@ -2479,7 +2479,7 @@ static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp, 
}



bool dispc_mgr_timings_ok(enum omap_channel channel,

		struct omap_video_timings *timings)

		const struct omap_video_timings *timings)

{

	bool timings_ok;

drivers/video/omap2/dss/dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev, 
	unsigned long pck;

	struct dispc_clock_info dispc_cinfo;



	if (!dispc_mgr_timings_ok(dssdev->manager->id, timings))

	if (dss_mgr_check_timings(dssdev->manager, timings))

		return -EINVAL;



	if (timings->pixel_clock == 0)

drivers/video/omap2/dss/dss.h

+3 −1
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ int dss_init_overlay_managers(struct platform_device *pdev); 
void dss_uninit_overlay_managers(struct platform_device *pdev);

int dss_mgr_simple_check(struct omap_overlay_manager *mgr,

		const struct omap_overlay_manager_info *info);

int dss_mgr_check_timings(struct omap_overlay_manager *mgr,

		const struct omap_video_timings *timings);

int dss_mgr_check(struct omap_overlay_manager *mgr,

		struct omap_dss_device *dssdev,

		struct omap_overlay_manager_info *info,
@@ -413,7 +415,7 @@ void dispc_enable_gamma_table(bool enable); 
void dispc_set_loadmode(enum omap_dss_load_mode mode);



bool dispc_mgr_timings_ok(enum omap_channel channel,

		struct omap_video_timings *timings);

		const struct omap_video_timings *timings);

unsigned long dispc_fclk_rate(void);

void dispc_find_clk_divs(bool is_tft, unsigned long req_pck, unsigned long fck,

		struct dispc_clock_info *cinfo);

drivers/video/omap2/dss/manager.c

+15 −0
Original line number Diff line number Diff line
@@ -654,6 +654,17 @@ static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr, 
	return 0;

}



int dss_mgr_check_timings(struct omap_overlay_manager *mgr,

		const struct omap_video_timings *timings)

{

	if (!dispc_mgr_timings_ok(mgr->id, timings)) {

		DSSERR("check_manager: invalid timings\n");

		return -EINVAL;

	}



	return 0;

}



int dss_mgr_check(struct omap_overlay_manager *mgr,

		struct omap_dss_device *dssdev,

		struct omap_overlay_manager_info *info,
@@ -668,6 +679,10 @@ int dss_mgr_check(struct omap_overlay_manager *mgr, 
			return r;

	}



	r = dss_mgr_check_timings(mgr, &dssdev->panel.timings);

	if (r)

		return r;



	list_for_each_entry(ovl, &mgr->overlays, list) {

		struct omap_overlay_info *oi;

		int r;