mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

OMAP: DSS2: move set/get_mirror() 

Move set/get_mirror() 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>
This commit is contained in:
Tomi Valkeinen 2010-01-08 16:30:33 +02:00
parent c75d9464c1
commit 8d8aa61dcf
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/plat-omap/include/plat/display.h
View File

@ -492,9 +492,6 @@ struct omap_dss_device {
u8 (*get_rotate)(struct omap_dss_device *dssdev);
int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
bool (*get_mirror)(struct omap_dss_device *dssdev);
int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);
int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
u32 (*get_wss)(struct omap_dss_device *dssdev);

8
drivers/video/omap2/displays/panel-taal.c
View File

@ -797,16 +797,20 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
dev_dbg(&dssdev->dev, "mirror %d\n", enable);
dsi_bus_lock();
if (td->enabled) {
r = taal_set_addr_mode(td->rotate, enable);
if (r)
return r;
goto err;
}
td->mirror = enable;
dsi_bus_unlock();
return 0;
err:
dsi_bus_unlock();
return r;
}
static bool taal_get_mirror(struct omap_dss_device *dssdev)

8
drivers/video/omap2/dss/display.c
View File

@ -215,9 +215,9 @@ static ssize_t display_mirror_show(struct device *dev,
{
struct omap_dss_device *dssdev = to_dss_device(dev);
int mirror;
if (!dssdev->get_mirror)
if (!dssdev->driver->get_mirror)
return -ENOENT;
mirror = dssdev->get_mirror(dssdev);
mirror = dssdev->driver->get_mirror(dssdev);
return snprintf(buf, PAGE_SIZE, "%u\n", mirror);
}
@ -228,12 +228,12 @@ static ssize_t display_mirror_store(struct device *dev,
unsigned long mirror;
int r;
if (!dssdev->set_mirror || !dssdev->get_mirror)
if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
return -ENOENT;
mirror = simple_strtoul(buf, NULL, 0);
r = dssdev->set_mirror(dssdev, mirror);
r = dssdev->driver->set_mirror(dssdev, mirror);
if (r)
return r;

25
drivers/video/omap2/dss/dsi.c
View File

@ -3562,28 +3562,6 @@ static u8 dsi_display_get_rotate(struct omap_dss_device *dssdev)
return dssdev->driver->get_rotate(dssdev);
}
static int dsi_display_set_mirror(struct omap_dss_device *dssdev, bool mirror)
{
DSSDBGF("%d", mirror);
if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
return -EINVAL;
dsi_bus_lock();
dssdev->driver->set_mirror(dssdev, mirror);
dsi_bus_unlock();
return 0;
}
static bool dsi_display_get_mirror(struct omap_dss_device *dssdev)
{
if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
return 0;
return dssdev->driver->get_mirror(dssdev);
}
void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
u32 fifo_size, enum omap_burst_size *burst_size,
u32 *fifo_low, u32 *fifo_high)
@ -3615,9 +3593,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
dssdev->get_rotate = dsi_display_get_rotate;
dssdev->set_rotate = dsi_display_set_rotate;
dssdev->get_mirror = dsi_display_get_mirror;
dssdev->set_mirror = dsi_display_set_mirror;
/* XXX these should be figured out dynamically */
dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;