diff options
| author | Hemant Hariyani <hemanthariyani@ti.com> | 2012-03-15 17:06:44 -0500 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-05-01 18:28:01 +0200 |
| commit | 638636f22a0e0a2a5117196155261ae872cf8cfb (patch) | |
| tree | 007bd896268c048e7cfaa4656fc29bb3c8e9ba39 | |
| parent | 7fa2ef920a5df7615b15d12d42e2d2fe0be708f8 (diff) | |
| download | kernel_samsung_tuna-638636f22a0e0a2a5117196155261ae872cf8cfb.zip kernel_samsung_tuna-638636f22a0e0a2a5117196155261ae872cf8cfb.tar.gz kernel_samsung_tuna-638636f22a0e0a2a5117196155261ae872cf8cfb.tar.bz2 | |
rpmsg-omx: Use ion abstraction to get handle from PVR fd
PVRExportFDToIONHandles was being called directly by rpmsg-omx.
This is now abstracted by ion and drivers should use
omap_ion_fd_to_handles instead.
Change-Id: I2f750887a048eb3d9cd28cdc9c4b08eb3e83e31b
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Conflicts:
drivers/rpmsg/rpmsg_omx.c
| -rw-r--r-- | drivers/rpmsg/rpmsg_omx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/rpmsg/rpmsg_omx.c b/drivers/rpmsg/rpmsg_omx.c index 0da3145..f044621 100644 --- a/drivers/rpmsg/rpmsg_omx.c +++ b/drivers/rpmsg/rpmsg_omx.c @@ -149,17 +149,18 @@ static int _rpmsg_omx_buffer_lookup(struct rpmsg_omx_instance *omx, goto exit; } -#ifdef CONFIG_PVR_SGX /* how about an sgx buffer wrapping an ion handle? */ { int fd; struct ion_handle *handles[2] = { NULL, NULL }; struct ion_client *pvr_ion_client; ion_phys_addr_t paddr2; + int num_handles = 2; fd = buffer; - PVRSRVExportFDToIONHandles(fd, &pvr_ion_client, - handles); + if (omap_ion_fd_to_handles(fd, &pvr_ion_client, + handles, &num_handles) < 0) + goto nopvr; /* Get the 1st buffer's da */ if ((handles[0]) && !ion_phys(pvr_ion_client, @@ -180,10 +181,9 @@ static int _rpmsg_omx_buffer_lookup(struct rpmsg_omx_instance *omx, } } -#endif } +nopvr: #endif - ret = _rpmsg_pa_to_da((phys_addr_t)tiler_virt2phys(buffer), va); exit: if (ret) |