Skip to content

Commit

Permalink
OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE
Browse files Browse the repository at this point in the history
Remove the option for forcing auto-update. Auto-update for manual update
displays is no more a DSS feature, so if a particular display devices does
have auto-update mode, it should be in display's custom settings.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Tomi Valkeinen committed Feb 24, 2010
1 parent 942a91a commit ddbfeb3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
9 changes: 0 additions & 9 deletions drivers/video/omap2/omapfb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ config FB_OMAP2_DEBUG_SUPPORT
Support for debug output. You have to enable the actual printing
with 'debug' module parameter.

config FB_OMAP2_FORCE_AUTO_UPDATE
bool "Force main display to automatic update mode"
depends on FB_OMAP2
help
Forces main display to automatic update mode (if possible),
and also enables tearsync (if possible). By default
displays that support manual update are started in manual
update mode.

config FB_OMAP2_NUM_FBS
int "Number of framebuffers"
range 1 10
Expand Down
17 changes: 3 additions & 14 deletions drivers/video/omap2/omapfb/omapfb-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2194,35 +2194,24 @@ 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

r = def_display->driver->enable(def_display);
if (r) {
dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
def_display->name);
goto cleanup;
}

/* set the update mode */
if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
u16 w, h;
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 (dssdrv->enable_te)
dssdrv->enable_te(def_display, 0);
if (dssdrv->set_update_mode)
dssdrv->set_update_mode(def_display,
OMAP_DSS_UPDATE_MANUAL);

dssdrv->get_resolution(def_display,
&w, &h);
dssdrv->get_resolution(def_display, &w, &h);
def_display->driver->update(def_display, 0, 0, w, h);
#endif
} else {
if (dssdrv->set_update_mode)
dssdrv->set_update_mode(def_display,
Expand Down

0 comments on commit ddbfeb3

Please sign in to comment.