Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

OMAP: DSS2: move set/get_update_mode()

Browse Source 
Move set/get_update_mode() 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-11 16:12:31 +02:00
parent 225b650d41
commit 446f7bff70
10 changed files with 84 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,11 +478,6 @@ struct omap_dss_device {
u16 x, u16 y, u16 w, u16 h);
int (*sync)(struct omap_dss_device *dssdev);
int (*set_update_mode)(struct omap_dss_device *dssdev,
enum omap_dss_update_mode);
enum omap_dss_update_mode (*get_update_mode)
(struct omap_dss_device *dssdev);
int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
u32 (*get_wss)(struct omap_dss_device *dssdev);
@ -507,6 +502,10 @@ struct omap_dss_driver {
void (*setup_update)(struct omap_dss_device *dssdev,
u16 x, u16 y, u16 w, u16 h);
int (*set_update_mode)(struct omap_dss_device *dssdev,
enum omap_dss_update_mode);
enum omap_dss_update_mode (*get_update_mode)(
struct omap_dss_device *dssdev);
int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
int (*wait_for_te)(struct omap_dss_device *dssdev);

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

@ -995,6 +995,20 @@ err:
queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
}
static int taal_set_update_mode(struct omap_dss_device *dssdev,
enum omap_dss_update_mode mode)
{
if (mode != OMAP_DSS_UPDATE_MANUAL)
return -EINVAL;
return 0;
}
static enum omap_dss_update_mode taal_get_update_mode(
struct omap_dss_device *dssdev)
{
return OMAP_DSS_UPDATE_MANUAL;
}
static struct omap_dss_driver taal_driver = {
.probe = taal_probe,
.remove = taal_remove,
@ -1005,6 +1019,8 @@ static struct omap_dss_driver taal_driver = {
.resume = taal_resume,
.setup_update = taal_setup_update,
.set_update_mode = taal_set_update_mode,
.get_update_mode = taal_get_update_mode,
.get_resolution = taal_get_resolution,
.get_recommended_bpp = omapdss_default_get_recommended_bpp,

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

@ -69,8 +69,8 @@ static ssize_t display_upd_mode_show(struct device *dev,
{
struct omap_dss_device *dssdev = to_dss_device(dev);
enum omap_dss_update_mode mode = OMAP_DSS_UPDATE_AUTO;
if (dssdev->get_update_mode)
mode = dssdev->get_update_mode(dssdev);
if (dssdev->driver->get_update_mode)
mode = dssdev->driver->get_update_mode(dssdev);
return snprintf(buf, PAGE_SIZE, "%d\n", mode);
}
@ -94,7 +94,7 @@ static ssize_t display_upd_mode_store(struct device *dev,
return -EINVAL;
}
r = dssdev->set_update_mode(dssdev, mode);
r = dssdev->driver->set_update_mode(dssdev, mode);
if (r)
return r;

27
drivers/video/omap2/dss/dpi.c
View File

@ -36,7 +36,6 @@
#include "dss.h"
static struct {
int update_enabled;
struct regulator *vdds_dsi_reg;
} dpi;
@ -376,30 +375,6 @@ static void dpi_get_timings(struct omap_dss_device *dssdev,
*timings = dssdev->panel.timings;
}
static int dpi_display_set_update_mode(struct omap_dss_device *dssdev,
enum omap_dss_update_mode mode)
{
if (mode == OMAP_DSS_UPDATE_MANUAL)
return -EINVAL;
if (mode == OMAP_DSS_UPDATE_DISABLED) {
dssdev->manager->disable(dssdev->manager);
dpi.update_enabled = 0;
} else {
dssdev->manager->enable(dssdev->manager);
dpi.update_enabled = 1;
}
return 0;
}
static enum omap_dss_update_mode dpi_display_get_update_mode(
struct omap_dss_device *dssdev)
{
return dpi.update_enabled ? OMAP_DSS_UPDATE_AUTO :
OMAP_DSS_UPDATE_DISABLED;
}
int dpi_init_display(struct omap_dss_device *dssdev)
{
DSSDBG("init_display\n");
@ -411,8 +386,6 @@ int dpi_init_display(struct omap_dss_device *dssdev)
dssdev->set_timings = dpi_set_timings;
dssdev->check_timings = dpi_check_timings;
dssdev->get_timings = dpi_get_timings;
dssdev->set_update_mode = dpi_display_set_update_mode;
dssdev->get_update_mode = dpi_display_get_update_mode;
return 0;
}

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

@ -243,8 +243,6 @@ static struct
struct dsi_update_region active_update_region;
struct completion update_completion;
enum omap_dss_update_mode user_update_mode;
enum omap_dss_update_mode update_mode;
bool te_enabled;
bool use_ext_te;
@ -345,9 +343,6 @@ static void dsi_perf_show(const char *name)
if (!dsi_perf)
return;
if (dsi.update_mode == OMAP_DSS_UPDATE_DISABLED)
return;
t = ktime_get();
setup_time = ktime_sub(dsi.perf_start_time, dsi.perf_setup_time);
@ -1704,9 +1699,8 @@ static int dsi_force_tx_stop_mode_io(void)
static int dsi_vc_enable(int channel, bool enable)
{
if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO)
DSSDBG("dsi_vc_enable channel %d, enable %d\n",
channel, enable);
DSSDBG("dsi_vc_enable channel %d, enable %d\n",
channel, enable);
enable = enable ? 1 : 0;
@ -1886,8 +1880,7 @@ static u16 dsi_vc_flush_receive_data(int channel)
static int dsi_vc_send_bta(int channel)
{
if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO &&
(dsi.debug_write || dsi.debug_read))
if (dsi.debug_write || dsi.debug_read)
DSSDBG("dsi_vc_send_bta %d\n", channel);
WARN_ON(!dsi_bus_is_locked());
@ -2740,9 +2733,8 @@ static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
use_te_trigger = dsi.te_enabled && !dsi.use_ext_te;
if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO)
DSSDBG("dsi_update_screen_dispc(%d,%d %dx%d)\n",
x, y, w, h);
DSSDBG("dsi_update_screen_dispc(%d,%d %dx%d)\n",
x, y, w, h);
bytespp = dssdev->ctrl.pixel_size / 8;
bytespl = w * bytespp;
@ -2840,45 +2832,6 @@ static void dsi_set_update_region(struct omap_dss_device *dssdev,
}
static int dsi_set_update_mode(struct omap_dss_device *dssdev,
enum omap_dss_update_mode mode)
{
int r = 0;
int i;
WARN_ON(!dsi_bus_is_locked());
if (dsi.update_mode != mode) {
dsi.update_mode = mode;
/* Mark the overlays dirty, and do apply(), so that we get the
* overlays configured properly after update mode change. */
for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
struct omap_overlay *ovl;
ovl = omap_dss_get_overlay(i);
if (ovl->manager == dssdev->manager)
ovl->info_dirty = true;
}
r = dssdev->manager->apply(dssdev->manager);
if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE &&
mode == OMAP_DSS_UPDATE_AUTO) {
u16 w, h;
DSSDBG("starting auto update\n");
dssdev->driver->get_resolution(dssdev, &w, &h);
dsi_set_update_region(dssdev, 0, 0, w, h);
wake_up(&dsi.waitqueue);
}
}
return r;
}
static void dsi_handle_framedone(void)
{
int r;
@ -2887,8 +2840,7 @@ static void dsi_handle_framedone(void)
use_te_trigger = dsi.te_enabled && !dsi.use_ext_te;
if (dsi.update_mode != OMAP_DSS_UPDATE_AUTO)
DSSDBG("FRAMEDONE\n");
DSSDBG("FRAMEDONE\n");
if (use_te_trigger) {
/* enable LP_RX_TO again after the TE */
@ -2927,9 +2879,7 @@ static int dsi_update_thread(void *data)
while (1) {
wait_event_interruptible(dsi.waitqueue,
dsi.update_mode == OMAP_DSS_UPDATE_AUTO ||
(dsi.update_mode == OMAP_DSS_UPDATE_MANUAL &&
dsi.update_region.dirty == true) ||
dsi.update_region.dirty == true ||
kthread_should_stop());
if (kthread_should_stop())
@ -2937,8 +2887,7 @@ static int dsi_update_thread(void *data)
dsi_bus_lock();
if (dsi.update_mode == OMAP_DSS_UPDATE_DISABLED ||
kthread_should_stop()) {
if (kthread_should_stop()) {
dsi_bus_unlock();
break;
}
@ -2960,9 +2909,8 @@ static int dsi_update_thread(void *data)
if (device->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
if (dsi.update_mode == OMAP_DSS_UPDATE_MANUAL)
dss_setup_partial_planes(device,
&x, &y, &w, &h);
dss_setup_partial_planes(device,
&x, &y, &w, &h);
dispc_set_lcd_size(w, h);
}
@ -3254,8 +3202,6 @@ static int dsi_display_enable(struct omap_dss_device *dssdev)
dsi.use_ext_te = dssdev->phy.dsi.ext_te;
dsi_set_update_mode(dssdev, dsi.user_update_mode);
dsi_bus_unlock();
mutex_unlock(&dsi.lock);
@ -3286,7 +3232,6 @@ static void dsi_display_disable(struct omap_dss_device *dssdev)
dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
goto end;
dsi.update_mode = OMAP_DSS_UPDATE_DISABLED;
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
dsi_display_uninit_dispc(dssdev);
@ -3313,7 +3258,6 @@ static int dsi_display_suspend(struct omap_dss_device *dssdev)
dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
goto end;
dsi.update_mode = OMAP_DSS_UPDATE_DISABLED;
dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
dsi_display_uninit_dispc(dssdev);
@ -3363,8 +3307,6 @@ static int dsi_display_resume(struct omap_dss_device *dssdev)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
dsi_set_update_mode(dssdev, dsi.user_update_mode);
dsi_bus_unlock();
mutex_unlock(&dsi.lock);
@ -3392,9 +3334,6 @@ static int dsi_display_update(struct omap_dss_device *dssdev,
mutex_lock(&dsi.lock);
if (dsi.update_mode != OMAP_DSS_UPDATE_MANUAL)
goto end;
if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
goto end;
@ -3436,8 +3375,7 @@ static int dsi_display_sync(struct omap_dss_device *dssdev)
mutex_lock(&dsi.lock);
dsi_bus_lock();
if (dsi.update_mode == OMAP_DSS_UPDATE_MANUAL &&
dsi.update_region.dirty) {
if (dsi.update_region.dirty) {
INIT_COMPLETION(dsi.update_completion);
wait = true;
} else {
@ -3454,32 +3392,6 @@ static int dsi_display_sync(struct omap_dss_device *dssdev)
return 0;
}
static int dsi_display_set_update_mode(struct omap_dss_device *dssdev,
enum omap_dss_update_mode mode)
{
int r = 0;
DSSDBGF("%d", mode);
mutex_lock(&dsi.lock);
dsi_bus_lock();
dsi.user_update_mode = mode;
r = dsi_set_update_mode(dssdev, mode);
dsi_bus_unlock();
mutex_unlock(&dsi.lock);
return r;
}
static enum omap_dss_update_mode dsi_display_get_update_mode(
struct omap_dss_device *dssdev)
{
return dsi.update_mode;
}
int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable)
{
dsi.te_enabled = enable;
@ -3510,8 +3422,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
dssdev->resume = dsi_display_resume;
dssdev->update = dsi_display_update;
dssdev->sync = dsi_display_sync;
dssdev->set_update_mode = dsi_display_set_update_mode;
dssdev->get_update_mode = dsi_display_get_update_mode;
/* XXX these should be figured out dynamically */
dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
@ -3562,9 +3472,6 @@ int dsi_init(struct platform_device *pdev)
dsi.te_timer.data = 0;
#endif
dsi.update_mode = OMAP_DSS_UPDATE_DISABLED;
dsi.user_update_mode = OMAP_DSS_UPDATE_DISABLED;
dsi.base = ioremap(DSI_BASE, DSI_SZ_REGS);
if (!dsi.base) {
DSSERR("can't ioremap DSI\n");

17
drivers/video/omap2/dss/manager.c
View File

@ -522,17 +522,18 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
u32 irq;
int r;
int i;
struct omap_dss_device *dssdev = mgr->device;
if (!mgr->device)
if (!dssdev)
return 0;
if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC) {
if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
channel = OMAP_DSS_CHANNEL_DIGIT;
} else {
if (mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
enum omap_dss_update_mode mode;
mode = mgr->device->get_update_mode(mgr->device);
mode = dssdev->driver->get_update_mode(dssdev);
if (mode != OMAP_DSS_UPDATE_AUTO)
return 0;
@ -605,7 +606,7 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
} else {
if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
enum omap_dss_update_mode mode;
mode = dssdev->get_update_mode(dssdev);
mode = dssdev->driver->get_update_mode(dssdev);
if (mode != OMAP_DSS_UPDATE_AUTO)
return 0;
@ -1209,7 +1210,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
oc->manual_update =
dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
dssdev->get_update_mode(dssdev) != OMAP_DSS_UPDATE_AUTO;
dssdev->driver->get_update_mode(dssdev) !=
OMAP_DSS_UPDATE_AUTO;
++num_planes_enabled;
}
@ -1250,7 +1252,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
mc->manual_update =
dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
dssdev->get_update_mode(dssdev) != OMAP_DSS_UPDATE_AUTO;
dssdev->driver->get_update_mode(dssdev) !=
OMAP_DSS_UPDATE_AUTO;
}
/* XXX TODO: Try to get fifomerge working. The problem is that it

26
drivers/video/omap2/dss/sdi.c
View File

@ -213,30 +213,6 @@ err:
return r;
}
static int sdi_display_set_update_mode(struct omap_dss_device *dssdev,
enum omap_dss_update_mode mode)
{
if (mode == OMAP_DSS_UPDATE_MANUAL)
return -EINVAL;
if (mode == OMAP_DSS_UPDATE_DISABLED) {
dssdev->manager->disable(dssdev->manager);
sdi.update_enabled = 0;
} else {
dssdev->manager->enable(dssdev->manager);
sdi.update_enabled = 1;
}
return 0;
}
static enum omap_dss_update_mode sdi_display_get_update_mode(
struct omap_dss_device *dssdev)
{
return sdi.update_enabled ? OMAP_DSS_UPDATE_AUTO :
OMAP_DSS_UPDATE_DISABLED;
}
static void sdi_get_timings(struct omap_dss_device *dssdev,
struct omap_video_timings *timings)
{
@ -251,8 +227,6 @@ int sdi_init_display(struct omap_dss_device *dssdev)
dssdev->disable = sdi_display_disable;
dssdev->suspend = sdi_display_suspend;
dssdev->resume = sdi_display_resume;
dssdev->set_update_mode = sdi_display_set_update_mode;
dssdev->get_update_mode = sdi_display_get_update_mode;
dssdev->get_timings = sdi_get_timings;
return 0;

27
drivers/video/omap2/dss/venc.c
View File

@ -450,6 +450,20 @@ static int venc_panel_resume(struct omap_dss_device *dssdev)
return venc_panel_enable(dssdev);
}
static enum omap_dss_update_mode venc_get_update_mode(
struct omap_dss_device *dssdev)
{
return OMAP_DSS_UPDATE_AUTO;
}
static int venc_set_update_mode(struct omap_dss_device *dssdev,
enum omap_dss_update_mode mode)
{
if (mode != OMAP_DSS_UPDATE_AUTO)
return -EINVAL;
return 0;
}
static struct omap_dss_driver venc_driver = {
.probe = venc_panel_probe,
.remove = venc_panel_remove,
@ -462,6 +476,9 @@ static struct omap_dss_driver venc_driver = {
.get_resolution = omapdss_default_get_resolution,
.get_recommended_bpp = omapdss_default_get_recommended_bpp,
.set_update_mode = venc_set_update_mode,
.get_update_mode = venc_get_update_mode,
.driver = {
.name = "venc",
.owner = THIS_MODULE,
@ -717,15 +734,6 @@ static int venc_set_wss(struct omap_dss_device *dssdev, u32 wss)
return 0;
}
static enum omap_dss_update_mode venc_display_get_update_mode(
struct omap_dss_device *dssdev)
{
if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
return OMAP_DSS_UPDATE_AUTO;
else
return OMAP_DSS_UPDATE_DISABLED;
}
int venc_init_display(struct omap_dss_device *dssdev)
{
DSSDBG("init_display\n");
@ -739,7 +747,6 @@ int venc_init_display(struct omap_dss_device *dssdev)
dssdev->check_timings = venc_check_timings;
dssdev->get_wss = venc_get_wss;
dssdev->set_wss = venc_set_wss;
dssdev->get_update_mode = venc_display_get_update_mode;
return 0;
}

13
drivers/video/omap2/omapfb/omapfb-ioctl.c
View File

@ -202,7 +202,7 @@ static int omapfb_set_update_mode(struct fb_info *fbi,
enum omap_dss_update_mode um;
int r;
if (!display || !display->set_update_mode)
if (!display || !display->driver->set_update_mode)
return -EINVAL;
switch (mode) {
@ -222,7 +222,7 @@ static int omapfb_set_update_mode(struct fb_info *fbi,
return -EINVAL;
}
r = display->set_update_mode(display, um);
r = display->driver->set_update_mode(display, um);
return r;
}
@ -233,10 +233,15 @@ static int omapfb_get_update_mode(struct fb_info *fbi,
struct omap_dss_device *display = fb2display(fbi);
enum omap_dss_update_mode m;
if (!display || !display->get_update_mode)
if (!display)
return -EINVAL;
m = display->get_update_mode(display);
if (!display->driver->get_update_mode) {
*mode = OMAPFB_AUTO_UPDATE;
return 0;
}
m = display->driver->get_update_mode(display);
switch (m) {
case OMAP_DSS_UPDATE_DISABLED:

27
drivers/video/omap2/omapfb/omapfb-main.c
View File

@ -1226,8 +1226,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
if (display->resume)
r = display->resume(display);
if (r == 0 && display->get_update_mode &&
display->get_update_mode(display) ==
if (r == 0 && display->driver->get_update_mode &&
display->driver->get_update_mode(display) ==
OMAP_DSS_UPDATE_MANUAL)
do_update = 1;
@ -2193,6 +2193,7 @@ static int omapfb_probe(struct platform_device *pdev)
}
if (def_display) {
struct omap_dss_driver *dssdrv = def_display->driver;
#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
u16 w, h;
#endif
@ -2206,25 +2207,25 @@ static int omapfb_probe(struct platform_device *pdev)
/* set the update mode */
if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
if (def_display->driver->enable_te)
def_display->driver->enable_te(def_display, 1);
if (def_display->set_update_mode)
def_display->set_update_mode(def_display,
if (dssdrv->enable_te)
dssdrv->enable_te(def_display, 1);
if (dssdrv->set_update_mode)
dssdrv->set_update_mode(def_display,
OMAP_DSS_UPDATE_AUTO);
#else /* MANUAL_UPDATE */
if (def_display->driver->enable_te)
def_display->driver->enable_te(def_display, 0);
if (def_display->set_update_mode)
def_display->set_update_mode(def_display,
if (dssdrv->enable_te)
dssdrv->enable_te(def_display, 0);
if (dssdrv->set_update_mode)
dssdrv->set_update_mode(def_display,
OMAP_DSS_UPDATE_MANUAL);
def_display->driver->get_resolution(def_display,
dssdrv->get_resolution(def_display,
&w, &h);
def_display->update(def_display, 0, 0, w, h);
#endif
} else {
if (def_display->set_update_mode)
def_display->set_update_mode(def_display,
if (dssdrv->set_update_mode)
dssdrv->set_update_mode(def_display,
OMAP_DSS_UPDATE_AUTO);
}
}