diff options
author | Grazvydas Ignotas <notasas@gmail.com> | 2012-05-10 07:19:56 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-11 07:44:21 -0400 |
commit | b3e68d306519cc96ff5ad2957d133997f91bb53e (patch) | |
tree | d3bc04745f82e682fda0096ed300ad9725fc4458 /drivers | |
parent | 0aca3c63e068e47616bdd54b9d19e4771db86e8e (diff) |
OMAPDSS: OMAPFB: always allow to configure overlay
Currently when multiple overlays are active, OMAPFB_SETUP_PLANE fails.
Instead of failing, allow it to configure the first overlay as if there
was only one overlay, the remaining ones will have to be configured in
other ways (sysfs).
This allows overlay-controlling programs (like video players) to function
properly when framebuffer is cloned to another display (like TV).
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/omap2/omapfb/omapfb-ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c index 27a85813c600..c6cf372d22c5 100644 --- a/drivers/video/omap2/omapfb/omapfb-ioctl.c +++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c | |||
@@ -70,7 +70,7 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi) | |||
70 | 70 | ||
71 | DBG("omapfb_setup_plane\n"); | 71 | DBG("omapfb_setup_plane\n"); |
72 | 72 | ||
73 | if (ofbi->num_overlays != 1) { | 73 | if (ofbi->num_overlays == 0) { |
74 | r = -EINVAL; | 74 | r = -EINVAL; |
75 | goto out; | 75 | goto out; |
76 | } | 76 | } |
@@ -185,7 +185,7 @@ static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi) | |||
185 | { | 185 | { |
186 | struct omapfb_info *ofbi = FB2OFB(fbi); | 186 | struct omapfb_info *ofbi = FB2OFB(fbi); |
187 | 187 | ||
188 | if (ofbi->num_overlays != 1) { | 188 | if (ofbi->num_overlays == 0) { |
189 | memset(pi, 0, sizeof(*pi)); | 189 | memset(pi, 0, sizeof(*pi)); |
190 | } else { | 190 | } else { |
191 | struct omap_overlay *ovl; | 191 | struct omap_overlay *ovl; |