diff options
| author | Emeric Vigier <emeric.vigier@stericsson.com> | 2011-05-17 09:50:32 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:26 +0200 |
| commit | 1438364620eea63e47dc7cdf49a7a84de0175e39 (patch) | |
| tree | bdc71abc36f4fed939964b28fca41ec2264b283b /drivers/video/mcde | |
| parent | ea84da40d999b8a013b1fa89e0b6b3b9be2fd349 (diff) | |
video: mcde: Add dss overlay info
This patch adds the possbility to get info about an overlay
via the dss interface.
It will also add the virtual address to the overlay struct.
ST-Ericsson Linux next: not tested, ER 282779
ST-Ericsson ID: 339343
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I2ece60331ccc0075358f4ea820c1dbab1d2402e7
Signed-off-by: Philippe Cornu <philippe.cornu@stericsson.com>
Signed-off-by: Emeric Vigier <emeric.vigier@stericsson.com>
Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23298
Reviewed-by: QATOOLS
Reviewed-by: Per-Daniel OLSSON <per-daniel.olsson@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/video/mcde')
| -rw-r--r-- | drivers/video/mcde/mcde_dss.c | 7 | ||||
| -rw-r--r-- | drivers/video/mcde/mcde_fb.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/video/mcde/mcde_dss.c b/drivers/video/mcde/mcde_dss.c index dd48be74217..2c5e4db20c6 100644 --- a/drivers/video/mcde/mcde_dss.c +++ b/drivers/video/mcde/mcde_dss.c @@ -290,6 +290,13 @@ update_failed: } EXPORT_SYMBOL(mcde_dss_update_overlay); +void mcde_dss_get_overlay_info(struct mcde_overlay *ovly, + struct mcde_overlay_info *info) { + if (info) + *info = ovly->info; +} +EXPORT_SYMBOL(mcde_dss_get_overlay_info); + void mcde_dss_get_native_resolution(struct mcde_display_device *ddev, u16 *x_res, u16 *y_res) { diff --git a/drivers/video/mcde/mcde_fb.c b/drivers/video/mcde/mcde_fb.c index dc0812761c7..cd7dd70101d 100644 --- a/drivers/video/mcde/mcde_fb.c +++ b/drivers/video/mcde/mcde_fb.c @@ -316,10 +316,14 @@ static void get_ovly_info(struct fb_info *fbi, struct mcde_overlay *ovly, memset(info, 0, sizeof(*info)); info->paddr = fbi->fix.smem_start + fbi->fix.line_length * fbi->var.yoffset; + info->vaddr = (u32 *)(fbi->screen_base + + fbi->fix.line_length * fbi->var.yoffset); /* TODO: move mem check to check_var/pan_display */ if (info->paddr + fbi->fix.line_length * fbi->var.yres > - fbi->fix.smem_start + fbi->fix.smem_len) + fbi->fix.smem_start + fbi->fix.smem_len) { info->paddr = fbi->fix.smem_start; + info->vaddr = (u32 *)fbi->screen_base; + } info->fmt = mfb->pix_fmt; info->stride = fbi->fix.line_length; if (ovly) { |