diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-12-20 10:52:01 -0600 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-31 09:42:32 +0200 |
| commit | fb00754a46b9bdb72a095ee476f7c175ea8fc16e (patch) | |
| tree | e73e9e34c531f2f97af6c476132596c60117b2ce | |
| parent | 3c571df921e186db5a205121b06d77bf04d53394 (diff) | |
| download | panda-fb00754a46b9bdb72a095ee476f7c175ea8fc16e.tar.gz | |
HACK: DSSCOMP: Remove uv check in gralloc_queue
uv is no longer used to mark fb.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| -rw-r--r-- | drivers/video/omap2/dsscomp/gralloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/omap2/dsscomp/gralloc.c b/drivers/video/omap2/dsscomp/gralloc.c index cbc92036743..5e5b6332ac8 100644 --- a/drivers/video/omap2/dsscomp/gralloc.c +++ b/drivers/video/omap2/dsscomp/gralloc.c @@ -297,7 +297,7 @@ int dsscomp_gralloc_queue(struct dsscomp_setup_dispc_data *d, /* swap red & blue if requested */ if (d->mgrs[mgr_ix].swap_rb) swap_rb_in_ovl_info(d->ovls + i); - +#if 0 /* copy prior overlay to avoid mapping layers twice to 1D */ if (oi->addressing == OMAP_DSS_BUFADDR_OVL_IX) { unsigned int j = oi->ba; @@ -309,7 +309,9 @@ int dsscomp_gralloc_queue(struct dsscomp_setup_dispc_data *d, oi->ba = d->ovls[j].ba; oi->uv = d->ovls[j].uv; goto skip_map1d; - } else if (oi->addressing == OMAP_DSS_BUFADDR_FB) { + } else +#endif + if (oi->addressing == OMAP_DSS_BUFADDR_FB) { /* get fb */ int fb_ix = (oi->ba >> 28); int fb_uv_ix = (oi->uv >> 28); |