diff options
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r-- | drivers/video/omap2/dss/dpi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 15c2c3301f4..97c7a10bc9f 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c | |||
@@ -41,6 +41,7 @@ static struct { | |||
41 | 41 | ||
42 | struct mutex lock; | 42 | struct mutex lock; |
43 | 43 | ||
44 | struct omap_video_timings timings; | ||
44 | struct dss_lcd_mgr_config mgr_config; | 45 | struct dss_lcd_mgr_config mgr_config; |
45 | } dpi; | 46 | } dpi; |
46 | 47 | ||
@@ -123,7 +124,7 @@ static int dpi_set_dispc_clk(struct omap_dss_device *dssdev, | |||
123 | 124 | ||
124 | static int dpi_set_mode(struct omap_dss_device *dssdev) | 125 | static int dpi_set_mode(struct omap_dss_device *dssdev) |
125 | { | 126 | { |
126 | struct omap_video_timings *t = &dssdev->panel.timings; | 127 | struct omap_video_timings *t = &dpi.timings; |
127 | int lck_div = 0, pck_div = 0; | 128 | int lck_div = 0, pck_div = 0; |
128 | unsigned long fck = 0; | 129 | unsigned long fck = 0; |
129 | unsigned long pck; | 130 | unsigned long pck; |
@@ -272,8 +273,8 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) | |||
272 | } | 273 | } |
273 | EXPORT_SYMBOL(omapdss_dpi_display_disable); | 274 | EXPORT_SYMBOL(omapdss_dpi_display_disable); |
274 | 275 | ||
275 | void dpi_set_timings(struct omap_dss_device *dssdev, | 276 | void omapdss_dpi_set_timings(struct omap_dss_device *dssdev, |
276 | struct omap_video_timings *timings) | 277 | struct omap_video_timings *timings) |
277 | { | 278 | { |
278 | int r; | 279 | int r; |
279 | 280 | ||
@@ -281,7 +282,9 @@ void dpi_set_timings(struct omap_dss_device *dssdev, | |||
281 | 282 | ||
282 | mutex_lock(&dpi.lock); | 283 | mutex_lock(&dpi.lock); |
283 | 284 | ||
285 | dpi.timings = *timings; | ||
284 | dssdev->panel.timings = *timings; | 286 | dssdev->panel.timings = *timings; |
287 | |||
285 | if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { | 288 | if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { |
286 | r = dispc_runtime_get(); | 289 | r = dispc_runtime_get(); |
287 | if (r) | 290 | if (r) |
@@ -296,7 +299,7 @@ void dpi_set_timings(struct omap_dss_device *dssdev, | |||
296 | 299 | ||
297 | mutex_unlock(&dpi.lock); | 300 | mutex_unlock(&dpi.lock); |
298 | } | 301 | } |
299 | EXPORT_SYMBOL(dpi_set_timings); | 302 | EXPORT_SYMBOL(omapdss_dpi_set_timings); |
300 | 303 | ||
301 | int dpi_check_timings(struct omap_dss_device *dssdev, | 304 | int dpi_check_timings(struct omap_dss_device *dssdev, |
302 | struct omap_video_timings *timings) | 305 | struct omap_video_timings *timings) |