diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-08 09:21:28 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-24 07:31:26 -0500 |
commit | 1a75ef422d0d1319bc0fab66b0bf339069519d8c (patch) | |
tree | b79c0ec7e84912c87d92e6a6aef0cfeb800d1270 /drivers/video/omap2/dss | |
parent | 1bbb275e261eb204795d4a48b3e485f2ad3d627c (diff) |
OMAP: DSS2: move run_test()
Move run_test() from omap_dss_device to omap_dss_driver.
This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/dss')
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 65c062f2862c..f01c9ca0fa5f 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -3584,43 +3584,6 @@ static bool dsi_display_get_mirror(struct omap_dss_device *dssdev) | |||
3584 | return dssdev->driver->get_mirror(dssdev); | 3584 | return dssdev->driver->get_mirror(dssdev); |
3585 | } | 3585 | } |
3586 | 3586 | ||
3587 | static int dsi_display_run_test(struct omap_dss_device *dssdev, int test_num) | ||
3588 | { | ||
3589 | int r; | ||
3590 | |||
3591 | if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) | ||
3592 | return -EIO; | ||
3593 | |||
3594 | DSSDBGF("%d", test_num); | ||
3595 | |||
3596 | dsi_bus_lock(); | ||
3597 | |||
3598 | /* run test first in low speed mode */ | ||
3599 | omapdss_dsi_vc_enable_hs(0, 0); | ||
3600 | |||
3601 | if (dssdev->driver->run_test) { | ||
3602 | r = dssdev->driver->run_test(dssdev, test_num); | ||
3603 | if (r) | ||
3604 | goto end; | ||
3605 | } | ||
3606 | |||
3607 | /* then in high speed */ | ||
3608 | omapdss_dsi_vc_enable_hs(0, 1); | ||
3609 | |||
3610 | if (dssdev->driver->run_test) { | ||
3611 | r = dssdev->driver->run_test(dssdev, test_num); | ||
3612 | if (r) | ||
3613 | goto end; | ||
3614 | } | ||
3615 | |||
3616 | end: | ||
3617 | omapdss_dsi_vc_enable_hs(0, 1); | ||
3618 | |||
3619 | dsi_bus_unlock(); | ||
3620 | |||
3621 | return r; | ||
3622 | } | ||
3623 | |||
3624 | static int dsi_display_memory_read(struct omap_dss_device *dssdev, | 3587 | static int dsi_display_memory_read(struct omap_dss_device *dssdev, |
3625 | void *buf, size_t size, | 3588 | void *buf, size_t size, |
3626 | u16 x, u16 y, u16 w, u16 h) | 3589 | u16 x, u16 y, u16 w, u16 h) |
@@ -3683,7 +3646,6 @@ int dsi_init_display(struct omap_dss_device *dssdev) | |||
3683 | dssdev->get_mirror = dsi_display_get_mirror; | 3646 | dssdev->get_mirror = dsi_display_get_mirror; |
3684 | dssdev->set_mirror = dsi_display_set_mirror; | 3647 | dssdev->set_mirror = dsi_display_set_mirror; |
3685 | 3648 | ||
3686 | dssdev->run_test = dsi_display_run_test; | ||
3687 | dssdev->memory_read = dsi_display_memory_read; | 3649 | dssdev->memory_read = dsi_display_memory_read; |
3688 | 3650 | ||
3689 | /* XXX these should be figured out dynamically */ | 3651 | /* XXX these should be figured out dynamically */ |