shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: init osd output pt value to 1, and fix osd buf hnd leak. [1/3]

Browse Source 
PD#148907: fix osd output fence error and framebuffer hnd leak.

Change-Id: Ic5a412d41b808766d6d0e05edeb770b2b20bb4a6
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
This commit is contained in:
sky zhou
2017-09-04 22:54:14 +08:00
committed by Jianxin Pan
parent 75c300edb7
commit 24963847bf
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/amlogic/media/common/ion_dev/dev_ion.c
View File

@@ -105,14 +105,25 @@ int meson_ion_share_fd_to_phys(struct ion_client *client,
int share_fd, ion_phys_addr_t *addr, size_t *len)
{
struct ion_handle *handle = NULL;
int ret;
handle = ion_import_dma_buf_fd(client, share_fd);
if (IS_ERR_OR_NULL(handle)) {
dprintk(0, "EINVAL, client=%p, share_fd=%d\n",
client, share_fd);
/* pr_err("%s,EINVAL, client=%p, share_fd=%d\n",
* __func__, client, share_fd);
*/
return PTR_ERR(handle);
}
return ion_phys(client, handle, addr, len);
ret = ion_phys(client, handle, addr, (size_t *)len);
pr_debug("ion_phys ret=%d, phys=0x%lx\n", ret, *addr);
ion_free(client, handle);
if (ret < 0) {
pr_err("ion_get_phys error, ret=%d\n", ret);
return ret;
}
return 0;
}
EXPORT_SYMBOL(meson_ion_share_fd_to_phys);
@@ -139,10 +150,12 @@ static int meson_ion_get_phys(
ret = ion_phys(client, handle, &addr, (size_t *)&len);
dprintk(1, "ret=%d, phys=0x%lX\n", ret, addr);
ion_free(client, handle);
if (ret < 0) {
dprintk(0, "meson_ion_get_phys error, ret=%d\n", ret);
return ret;
}
data.phys_addr = (unsigned int)addr;
data.size = (unsigned int)len;
if (copy_to_user((void __user *)arg, &data,

1
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -103,6 +103,7 @@ static void *osd_timeline_create(void)
const char *tlName = "osd_timeline";
if (osd_timeline == NULL) {
cur_streamline_val = 1;
osd_timeline = aml_sync_create_timeline(tlName);
osd_tprintk("osd timeline create\n");
}