From bdcae3cc39e8232eca81504a2ff9c60f4cc8f22d Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Wed, 8 Aug 2012 14:29:48 +0530 Subject: [PATCH] OMAPDSS: DPI displays: Take care of panel timings in the driver itself The timings maintained in omap_dss_device(dssdev->panel.timings) should be maintained by the panel driver itself. It's the panel drivers responsibility to update it if a new set of timings is to be configured. The DPI interface driver shouldn't be responsible of updating the panel timings, it's responsible of maintianing it's own copy of timings. Signed-off-by: Archit Taneja --- drivers/video/omap2/displays/panel-generic-dpi.c | 2 ++ drivers/video/omap2/displays/panel-tfp410.c | 1 + drivers/video/omap2/displays/panel-tpo-td043mtea1.c | 2 ++ drivers/video/omap2/dss/dpi.c | 1 - 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c index 8d4e102bb0e6..a07e18c8f71b 100644 --- a/drivers/video/omap2/displays/panel-generic-dpi.c +++ b/drivers/video/omap2/displays/panel-generic-dpi.c @@ -730,6 +730,8 @@ static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev, omapdss_dpi_set_timings(dssdev, timings); + dssdev->panel.timings = *timings; + mutex_unlock(&drv_data->lock); } diff --git a/drivers/video/omap2/displays/panel-tfp410.c b/drivers/video/omap2/displays/panel-tfp410.c index c6f950321f21..9397236084b1 100644 --- a/drivers/video/omap2/displays/panel-tfp410.c +++ b/drivers/video/omap2/displays/panel-tfp410.c @@ -234,6 +234,7 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev, mutex_lock(&ddata->lock); omapdss_dpi_set_timings(dssdev, timings); + dssdev->panel.timings = *timings; mutex_unlock(&ddata->lock); } diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c index ecb163e4cfaf..3f47f5f594b4 100644 --- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c +++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c @@ -483,6 +483,8 @@ static void tpo_td043_set_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings) { omapdss_dpi_set_timings(dssdev, timings); + + dssdev->panel.timings = *timings; } static int tpo_td043_check_timings(struct omap_dss_device *dssdev, diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 97c7a10bc9ff..d561a9198a8d 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -283,7 +283,6 @@ void omapdss_dpi_set_timings(struct omap_dss_device *dssdev, mutex_lock(&dpi.lock); dpi.timings = *timings; - dssdev->panel.timings = *timings; if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { r = dispc_runtime_get();