diff options
| author | Pavel Nedev <pnedev@mm-sol.com> | 2011-11-03 11:16:16 +0200 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-01-13 03:22:43 +0100 |
| commit | ddfc44c6c3580b9f028b950f084ace256eefc31a (patch) | |
| tree | 10fde283edb29c30141ec4897df403d71114802b /drivers/video/omap2 | |
| parent | d2ffff1fdce097b0557b31fecb7a0fc87630f007 (diff) | |
| download | kernel_samsung_tuna-ddfc44c6c3580b9f028b950f084ace256eefc31a.zip kernel_samsung_tuna-ddfc44c6c3580b9f028b950f084ace256eefc31a.tar.gz kernel_samsung_tuna-ddfc44c6c3580b9f028b950f084ace256eefc31a.tar.bz2 | |
Revert "Revert "DSSCOMP: Added UV buffer user-space address to the API""
This reverts commit 2ca61536d413af33d9ef58db249a327991f62a79.
Change-Id: I9d00daf95698b14d5029a49f3802400e8f60d4da
Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
Conflicts:
include/video/dsscomp.h
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dsscomp/device.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/omap2/dsscomp/device.c b/drivers/video/omap2/dsscomp/device.c index 673f219..7204eb6 100644 --- a/drivers/video/omap2/dsscomp/device.c +++ b/drivers/video/omap2/dsscomp/device.c @@ -239,9 +239,13 @@ static long setup_mgr(struct dsscomp_dev *cdev, u32 addr = (u32) oi->address; /* convert addresses to user space */ - if (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12) - oi->uv = hwc_virt_to_phys(addr + + if (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12) { + if (oi->uv_addr) + oi->uv = hwc_virt_to_phys((u32) oi->uv_addr); + else + oi->uv = hwc_virt_to_phys(addr + oi->cfg.height * oi->cfg.stride); + } oi->ba = hwc_virt_to_phys(addr); r = r ? : dsscomp_set_ovl(comp, oi); |