| author | baocheng sun <baocheng.sun@amlogic.com> | 2019-09-26 12:12:23 (GMT) |
|---|---|---|
| committer | [B <baocheng.sun@amlogic.com> | 2019-09-27 05:43:13 (GMT) |
| commit | 6d31b29cdebf8010a39cffd2e95262a18bc96e9e (patch) | |
| tree | f342ec56b47c8fdd7c0fc6dadda44c89146aff7b | |
| parent | 281a167446a91f3088e8aae3266da55c864f115b (diff) | |
| download | gralloc-6d31b29cdebf8010a39cffd2e95262a18bc96e9e.zip gralloc-6d31b29cdebf8010a39cffd2e95262a18bc96e9e.tar.gz gralloc-6d31b29cdebf8010a39cffd2e95262a18bc96e9e.tar.bz2 | |
gralloc: no need of ion cache invalid [1/1]
PD#OTT-6383
Problem:
Horizontal lines can be seen on display after empty
voice search multiple times.
Solution:
Regression caused by cts fixe for PD#SWPL-13517.
Revert "gralloc: fixed EncodeDecode failed [1/1]"
Verify:
raven
This reverts commit 281a167446a91f3088e8aae3266da55c864f115b.
Change-Id: I291f25f233e22b43e0b383d702c325a90ead8226
Signed-off-by: baocheng sun <baocheng.sun@amlogic.com>
| -rw-r--r-- | ion_wrapper.cpp | 8 | ||||
| -rw-r--r-- | ion_wrapper.h | 1 | ||||
| -rw-r--r-- | mali_gralloc_ion.cpp | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/ion_wrapper.cpp b/ion_wrapper.cpp index 5af3c80..13d46c4 100644 --- a/ion_wrapper.cpp +++ b/ion_wrapper.cpp @@ -34,7 +34,6 @@ #include <log/log.h> -#define ION_IOC_INVALID_CACHE _IOWR(ION_IOC_MAGIC, 9, struct ion_fd_data) enum ion_version { ION_VERSION_UNKNOWN, ION_VERSION_MODERN, ION_VERSION_LEGACY }; static atomic_int g_ion_version = ATOMIC_VAR_INIT(ION_VERSION_UNKNOWN); @@ -252,10 +251,3 @@ int ion_query_get_heaps(int fd, int cnt, void* buffers) { ret = ion_ioctl(fd, ION_IOC_HEAP_QUERY, &query); return ret; } -int ion_cache_invalid(int fd, int share_fd) -{ - struct ion_fd_data data = { - .fd = share_fd, - }; - return ion_ioctl(fd, ION_IOC_INVALID_CACHE, &data); -} diff --git a/ion_wrapper.h b/ion_wrapper.h index 09a58a7..a60d24e 100644 --- a/ion_wrapper.h +++ b/ion_wrapper.h @@ -52,5 +52,4 @@ int ion_is_legacy(int fd); __END_DECLS -int ion_cache_invalid(int fd, int handle_fd); #endif /* __SYS_CORE_ION_H */ diff --git a/mali_gralloc_ion.cpp b/mali_gralloc_ion.cpp index e82be40..6b4d548 100644 --- a/mali_gralloc_ion.cpp +++ b/mali_gralloc_ion.cpp @@ -24,6 +24,8 @@ #include <cutils/log.h> #include <cutils/atomic.h> +#include <linux/ion.h> +#include <ion/ion.h> #include <sys/ioctl.h> #include <hardware/hardware.h> @@ -33,7 +35,6 @@ #else #include <hardware/gralloc.h> #endif -#include "ion_wrapper.h" #ifdef GRALLOC_AML_EXTEND #include "amlogic/am_gralloc_internal.h" @@ -571,7 +572,6 @@ void mali_gralloc_ion_sync(const mali_gralloc_module *m, private_handle_t *hnd) if (!(hnd->flags & private_handle_t::PRIV_FLAGS_USES_ION_DMA_HEAP)) { ion_sync_fd(m->ion_client, hnd->share_fd); - ion_cache_invalid(m->ion_client, hnd->share_fd); } break; |