summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Lorentzon <marcus.xm.lorentzon@stericsson.com>2011-10-03 18:00:59 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:04:11 +0200
commit23c40762326cfc07c10f1acebe6c279f8acfc912 (patch)
tree0c9aa9fc084b5c6834667fe4b33e9ac28156e600
parentf38febcb6444912adeb15d5b40f8511984b125fc (diff)
video: mcde: Remove prepare for update
Prepare for update was only used for partial updates and partial update is no longer supported (and never worked). ST-Ericsson ID: 365249 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If927e73805c2bba873b477a20be3ee5a94ac77cd Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32866 Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
-rw-r--r--drivers/video/mcde/display-ab8500.c1
-rw-r--r--drivers/video/mcde/display-av8100.c1
-rw-r--r--drivers/video/mcde/display-fictive.c1
-rw-r--r--drivers/video/mcde/display-generic_dsi.c2
-rw-r--r--drivers/video/mcde/display-sony_acx424akp_dsi.c1
-rw-r--r--drivers/video/mcde/display-vuib500-dpi.c1
-rw-r--r--drivers/video/mcde/mcde_display.c37
-rw-r--r--include/video/mcde_display.h2
8 files changed, 0 insertions, 46 deletions
diff --git a/drivers/video/mcde/display-ab8500.c b/drivers/video/mcde/display-ab8500.c
index 789bf28cdf1..f465b0617c7 100644
--- a/drivers/video/mcde/display-ab8500.c
+++ b/drivers/video/mcde/display-ab8500.c
@@ -136,7 +136,6 @@ static int __devinit ab8500_probe(struct mcde_display_device *ddev)
ddev->set_power_mode = set_power_mode;
ddev->on_first_update = on_first_update;
ddev->update = display_update;
- ddev->prepare_for_update = NULL;
return 0;
diff --git a/drivers/video/mcde/display-av8100.c b/drivers/video/mcde/display-av8100.c
index 69b5afdd7dd..e076398ca45 100644
--- a/drivers/video/mcde/display-av8100.c
+++ b/drivers/video/mcde/display-av8100.c
@@ -1423,7 +1423,6 @@ static int __devinit hdmi_probe(struct mcde_display_device *dev)
if (av8100_ver_get() > AV8100_CHIPVER_1)
dev->port->phy.dsi.clk_cont = true;
- dev->prepare_for_update = NULL;
dev->on_first_update = hdmi_on_first_update;
dev->try_video_mode = hdmi_try_video_mode;
dev->set_video_mode = hdmi_set_video_mode;
diff --git a/drivers/video/mcde/display-fictive.c b/drivers/video/mcde/display-fictive.c
index 8389357a693..c7ea1429b9f 100644
--- a/drivers/video/mcde/display-fictive.c
+++ b/drivers/video/mcde/display-fictive.c
@@ -19,7 +19,6 @@
static int __devinit fictive_probe(struct mcde_display_device *dev)
{
- dev->prepare_for_update = NULL;
dev->platform_enable = NULL,
dev->platform_disable = NULL,
dev->set_power_mode = NULL;
diff --git a/drivers/video/mcde/display-generic_dsi.c b/drivers/video/mcde/display-generic_dsi.c
index 5e3b38ccba1..75b1c6e2be8 100644
--- a/drivers/video/mcde/display-generic_dsi.c
+++ b/drivers/video/mcde/display-generic_dsi.c
@@ -207,8 +207,6 @@ static int __devinit generic_probe(struct mcde_display_device *dev)
}
}
- /* TODO: Remove when DSI send command uses interrupts */
- dev->prepare_for_update = NULL;
dev->platform_enable = generic_platform_enable,
dev->platform_disable = generic_platform_disable,
dev->set_power_mode = generic_set_power_mode;
diff --git a/drivers/video/mcde/display-sony_acx424akp_dsi.c b/drivers/video/mcde/display-sony_acx424akp_dsi.c
index 602c85f229f..3cad2b9718e 100644
--- a/drivers/video/mcde/display-sony_acx424akp_dsi.c
+++ b/drivers/video/mcde/display-sony_acx424akp_dsi.c
@@ -285,7 +285,6 @@ static int __devinit sony_acx424akp_probe(struct mcde_display_device *dev)
}
/* TODO: Remove when DSI send command uses interrupts */
- dev->prepare_for_update = NULL;
dev->platform_enable = sony_acx424akp_platform_enable,
dev->platform_disable = sony_acx424akp_platform_disable,
dev->set_power_mode = sony_acx424akp_set_power_mode;
diff --git a/drivers/video/mcde/display-vuib500-dpi.c b/drivers/video/mcde/display-vuib500-dpi.c
index def5fe7c0ab..2bd5b990608 100644
--- a/drivers/video/mcde/display-vuib500-dpi.c
+++ b/drivers/video/mcde/display-vuib500-dpi.c
@@ -50,7 +50,6 @@ static int __devinit dpi_display_probe(struct mcde_display_device *ddev)
ddev->try_video_mode = try_video_mode;
ddev->set_video_mode = set_video_mode;
- ddev->prepare_for_update = NULL;
dev_info(&ddev->dev, "DPI display probed\n");
goto out;
diff --git a/drivers/video/mcde/mcde_display.c b/drivers/video/mcde/mcde_display.c
index 04c0f1cebb1..28409166c7d 100644
--- a/drivers/video/mcde/mcde_display.c
+++ b/drivers/video/mcde/mcde_display.c
@@ -333,18 +333,6 @@ static int mcde_display_update_default(struct mcde_display_device *ddev,
{
int ret = 0;
- /* TODO: Dirty */
- if (ddev->prepare_for_update) {
- /* TODO: Send dirty rectangle */
- ret = ddev->prepare_for_update(ddev, 0, 0,
- ddev->native_x_res, ddev->native_y_res);
- if (ret < 0) {
- dev_warn(&ddev->dev,
- "%s:Failed to prepare for update\n", __func__);
- return ret;
- }
- }
- /* TODO: Calculate & set update rect */
ret = mcde_chnl_update(ddev->chnl_state, &ddev->update_area,
tripple_buffer);
if (ret < 0) {
@@ -369,30 +357,6 @@ static int mcde_display_update_default(struct mcde_display_device *ddev,
return 0;
}
-static int mcde_display_prepare_for_update_default(
- struct mcde_display_device *ddev,
- u16 x, u16 y, u16 w, u16 h)
-{
- int ret;
- u8 params[8] = { x >> 8, x & 0xff,
- (x + w - 1) >> 8, (x + w - 1) & 0xff,
- y >> 8, y & 0xff,
- (y + h - 1) >> 8, (y + h - 1) & 0xff };
-
- if (ddev->port->type != MCDE_PORTTYPE_DSI)
- return -EINVAL;
-
- ret = mcde_dsi_dcs_write(ddev->chnl_state,
- DCS_CMD_SET_COLUMN_ADDRESS, &params[0], 4);
- if (ret)
- return ret;
-
- ret = mcde_dsi_dcs_write(ddev->chnl_state,
- DCS_CMD_SET_PAGE_ADDRESS, &params[4], 4);
-
- return ret;
-}
-
static inline int mcde_display_on_first_update_default(
struct mcde_display_device *ddev)
{
@@ -424,7 +388,6 @@ void mcde_display_init_device(struct mcde_display_device *ddev)
ddev->apply_config = mcde_display_apply_config_default;
ddev->invalidate_area = mcde_display_invalidate_area_default;
ddev->update = mcde_display_update_default;
- ddev->prepare_for_update = mcde_display_prepare_for_update_default;
ddev->on_first_update = mcde_display_on_first_update_default;
mutex_init(&ddev->display_lock);
diff --git a/include/video/mcde_display.h b/include/video/mcde_display.h
index 6519660f489..9f9f960e46c 100644
--- a/include/video/mcde_display.h
+++ b/include/video/mcde_display.h
@@ -101,8 +101,6 @@ struct mcde_display_device {
int (*invalidate_area)(struct mcde_display_device *dev,
struct mcde_rectangle *area);
int (*update)(struct mcde_display_device *dev, bool tripple_buffer);
- int (*prepare_for_update)(struct mcde_display_device *dev,
- u16 x, u16 y, u16 w, u16 h);
int (*on_first_update)(struct mcde_display_device *dev);
int (*platform_enable)(struct mcde_display_device *dev);
int (*platform_disable)(struct mcde_display_device *dev);