From 063a0c3e0e45a9de3d12811885463565655cbfde Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 26 Jun 2009 11:53:21 +0300 Subject: [PATCH 123/146] DSS2: DSI: Fix external TE wait --- arch/arm/plat-omap/include/mach/display.h | 1 - drivers/video/omap2/dss/dsi.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h index be07c35..92603eb 100644 --- a/arch/arm/plat-omap/include/mach/display.h +++ b/arch/arm/plat-omap/include/mach/display.h @@ -453,7 +453,6 @@ struct omap_dss_device { int (*enable_te)(struct omap_dss_device *dssdev, bool enable); int (*get_te)(struct omap_dss_device *dssdev); - int (*wait_for_te)(struct omap_dss_device *dssdev); u8 (*get_rotate)(struct omap_dss_device *dssdev); int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate); diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 875be0c..f3553f8 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -2775,8 +2775,9 @@ static int dsi_update_thread(void *data) device->driver->setup_update(device, x, y, w, h); #endif - if (dsi.te_enabled && dsi.use_ext_te && device->wait_for_te) - device->wait_for_te(device); + if (dsi.te_enabled && dsi.use_ext_te && + device->driver->wait_for_te) + device->driver->wait_for_te(device); dsi_perf_mark_start(); -- 1.6.2.4