summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-03 03:06:55 +0000
committerSteve Kondik <shade@chemlab.org>2014-12-09 22:35:04 +0000
commit46b7e320853f1f5951de1c017d38851b49fd2d02 (patch)
tree778d669108f0b92c4bbcb3f63d111d60edeafb00
parent122f3e26f3515c9bc01405af25b0c5f7f28b277e (diff)
downloadandroid_frameworks_native-46b7e320853f1f5951de1c017d38851b49fd2d02.tar.gz
android_frameworks_native-46b7e320853f1f5951de1c017d38851b49fd2d02.tar.bz2
android_frameworks_native-46b7e320853f1f5951de1c017d38851b49fd2d02.zip
exynos4: getphys implementation on buffermanager for samsung omx
Conflicts: include/media/hardware/HardwareAPI.h include/ui/GraphicBufferMapper.h libs/ui/GraphicBufferMapper.cpp Conflicts: libs/ui/GraphicBufferMapper.cpp Change-Id: I88db141e29a50986bee8d9555d145d1f92ea6ecf
-rw-r--r--include/ui/GraphicBufferMapper.h4
-rw-r--r--libs/ui/GraphicBufferMapper.cpp14
2 files changed, 18 insertions, 0 deletions
diff --git a/include/ui/GraphicBufferMapper.h b/include/ui/GraphicBufferMapper.h
index 98fff0ef3..0ffc582cb 100644
--- a/include/ui/GraphicBufferMapper.h
+++ b/include/ui/GraphicBufferMapper.h
@@ -58,6 +58,10 @@ public:
status_t unlockAsync(buffer_handle_t handle, int *fenceFd);
+#ifdef EXYNOS4_ENHANCEMENTS
+ status_t getphys(buffer_handle_t handle, void** paddr);
+#endif
+
// dumps information about the mapping of this handle
void dump(buffer_handle_t handle);
diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp
index 320b6c03d..9f01249a7 100644
--- a/libs/ui/GraphicBufferMapper.cpp
+++ b/libs/ui/GraphicBufferMapper.cpp
@@ -171,5 +171,19 @@ status_t GraphicBufferMapper::unlockAsync(buffer_handle_t handle, int *fenceFd)
return err;
}
+#ifdef EXYNOS4_ENHANCEMENTS
+status_t GraphicBufferMapper::getphys(buffer_handle_t handle, void** paddr)
+{
+ status_t err;
+
+ err = mAllocMod->getphys(mAllocMod, handle, paddr);
+
+ ALOGW_IF(err, "getphys(%p) fail %d(%s)",
+ handle, err, strerror(-err));
+ return err;
+}
+#endif
+
+
// ---------------------------------------------------------------------------
}; // namespace android