diff options
| author | Cris Jansson <cjansson@ti.com> | 2011-09-23 16:41:41 -0500 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-03-13 11:20:27 +0800 |
| commit | 481364799064ac213817b0eb2ab9540871db7b65 (patch) | |
| tree | d3399a92b321478b1b3a2aa23d8ef8e3b3d5824f | |
| parent | 6bfc0e2dd3adc3780cf9a0d94cf65753fefcf656 (diff) | |
rpmsg: omx: build rpmsg_omx even if TILER is not selected
The OMX driver does not need TILER for basic messaging. The
call to tiler_virt2phys() is moved behind a check for
CONFIG_TI_TILER to break the dependency. If TILER is not
included in the kernel then only mappings of
RPC_OMX_MAP_INFO_NONE are allowed. Others would return an
error back to userspace.
Signed-off-by: Cris Jansson <cjansson@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
| -rw-r--r-- | drivers/rpmsg/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/rpmsg/rpmsg_omx.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig index e40c9d87b63..1927ac4620a 100644 --- a/drivers/rpmsg/Kconfig +++ b/drivers/rpmsg/Kconfig @@ -19,7 +19,6 @@ config RPMSG_OMX tristate "rpmsg OMX driver" default y depends on RPMSG - depends on TI_TILER ---help--- An rpmsg driver that exposes OMX API to user space, in order to allow multimedia applications to offload OMX processing to diff --git a/drivers/rpmsg/rpmsg_omx.c b/drivers/rpmsg/rpmsg_omx.c index 6cfbdee666c..f32d7ce8986 100644 --- a/drivers/rpmsg/rpmsg_omx.c +++ b/drivers/rpmsg/rpmsg_omx.c @@ -36,7 +36,9 @@ #include <linux/rpmsg_omx.h> #include <linux/completion.h> +#ifdef CONFIG_TI_TILER #include <mach/tiler.h> +#endif #ifdef CONFIG_ION_OMAP #include <linux/ion.h> @@ -184,7 +186,10 @@ static int _rpmsg_omx_buffer_lookup(struct rpmsg_omx_instance *omx, } #endif +#ifdef CONFIG_TI_TILER ret = _rpmsg_pa_to_da((phys_addr_t)tiler_virt2phys(buffer), va); +#endif + exit: if (ret) pr_err("%s: buffer lookup failed %x\n", __func__, ret); |