gralloc: Add allocator and mapper HALs
Implement the hidl .hal interfaces directly instead of using the
default shims.
This is required since new additions to .hal will no longer be
added to the legacy gralloc1 C header.
Change-Id: If577a14f75d7d13da0ff656c96ab451d21c910ce
diff --git a/gralloc/gr_buf_mgr.h b/gralloc/gr_buf_mgr.h
index e021afd..24b4c23 100644
--- a/gralloc/gr_buf_mgr.h
+++ b/gralloc/gr_buf_mgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
* Not a Contribution
*
* Copyright (C) 2008 The Android Open Source Project
@@ -21,69 +21,41 @@
#define __GR_BUF_MGR_H__
#include <pthread.h>
+#include <mutex>
#include <unordered_map>
#include <unordered_set>
#include <utility>
-#include <mutex>
-#include "gralloc_priv.h"
#include "gr_allocator.h"
#include "gr_buf_descriptor.h"
+#include "gralloc_priv.h"
-namespace gralloc1 {
+namespace gralloc {
+
+using android::hardware::graphics::mapper::V2_0::Error;
class BufferManager {
public:
~BufferManager();
- gralloc1_error_t CreateBufferDescriptor(gralloc1_buffer_descriptor_t *descriptor_id);
- gralloc1_error_t DestroyBufferDescriptor(gralloc1_buffer_descriptor_t descriptor_id);
- gralloc1_error_t AllocateBuffers(uint32_t num_descriptors,
- const gralloc1_buffer_descriptor_t *descriptor_ids,
- buffer_handle_t *out_buffers);
- gralloc1_error_t RetainBuffer(private_handle_t const *hnd);
- gralloc1_error_t ReleaseBuffer(private_handle_t const *hnd);
- gralloc1_error_t LockBuffer(const private_handle_t *hnd, gralloc1_producer_usage_t prod_usage,
- gralloc1_consumer_usage_t cons_usage);
- gralloc1_error_t UnlockBuffer(const private_handle_t *hnd);
- gralloc1_error_t Perform(int operation, va_list args);
- gralloc1_error_t GetFlexLayout(const private_handle_t *hnd, struct android_flex_layout *layout);
- gralloc1_error_t GetNumFlexPlanes(const private_handle_t *hnd, uint32_t *out_num_planes);
- gralloc1_error_t Dump(std::ostringstream *os);
- template <typename... Args>
- gralloc1_error_t CallBufferDescriptorFunction(gralloc1_buffer_descriptor_t descriptor_id,
- void (BufferDescriptor::*member)(Args...),
- Args... args) {
- std::lock_guard<std::mutex> lock(descriptor_lock_);
- const auto map_descriptor = descriptors_map_.find(descriptor_id);
- if (map_descriptor == descriptors_map_.end()) {
- return GRALLOC1_ERROR_BAD_DESCRIPTOR;
- }
- const auto descriptor = map_descriptor->second;
- (descriptor.get()->*member)(std::forward<Args>(args)...);
- return GRALLOC1_ERROR_NONE;
- }
-
- static BufferManager* GetInstance() {
- static BufferManager *instance = new BufferManager();
- return instance;
- }
+ Error AllocateBuffer(const BufferDescriptor &descriptor, buffer_handle_t *handle,
+ unsigned int bufferSize = 0);
+ Error RetainBuffer(private_handle_t const *hnd);
+ Error ReleaseBuffer(private_handle_t const *hnd);
+ Error LockBuffer(const private_handle_t *hnd, uint64_t usage);
+ Error UnlockBuffer(const private_handle_t *hnd);
+ Error Dump(std::ostringstream *os);
+ static BufferManager *GetInstance();
private:
BufferManager();
- gralloc1_error_t MapBuffer(private_handle_t const *hnd);
+ Error MapBuffer(private_handle_t const *hnd);
int GetBufferType(int format);
- int AllocateBufferLocked(const BufferDescriptor &descriptor, buffer_handle_t *handle,
- unsigned int bufferSize = 0);
- uint32_t GetDataAlignment(int format, gralloc1_producer_usage_t prod_usage,
- gralloc1_consumer_usage_t cons_usage);
- int GetHandleFlags(int format, gralloc1_producer_usage_t prod_usage,
- gralloc1_consumer_usage_t cons_usage);
- void CreateSharedHandle(buffer_handle_t inbuffer, const BufferDescriptor &descriptor,
- buffer_handle_t *out_buffer);
+ uint32_t GetDataAlignment(int format, uint64_t usage);
+ int GetHandleFlags(int format, uint64_t usage);
// Imports the ion fds into the current process. Returns an error for invalid handles
- gralloc1_error_t ImportHandleLocked(private_handle_t *hnd);
+ Error ImportHandleLocked(private_handle_t *hnd);
// Creates a Buffer from the valid private handle and adds it to the map
void RegisterHandleLocked(const private_handle_t *hnd, int ion_handle, int ion_handle_meta);
@@ -103,16 +75,13 @@
int ion_handle_meta = -1;
Buffer() = delete;
- explicit Buffer(const private_handle_t* h, int ih_main = -1, int ih_meta = -1):
- handle(h),
- ion_handle_main(ih_main),
- ion_handle_meta(ih_meta) {
- }
+ explicit Buffer(const private_handle_t *h, int ih_main = -1, int ih_meta = -1)
+ : handle(h), ion_handle_main(ih_main), ion_handle_meta(ih_meta) {}
void IncRef() { ++ref_count; }
bool DecRef() { return --ref_count == 0; }
};
- gralloc1_error_t FreeBuffer(std::shared_ptr<Buffer> buf);
+ Error FreeBuffer(std::shared_ptr<Buffer> buf);
// Get the wrapper Buffer object from the handle, returns nullptr if handle is not found
std::shared_ptr<Buffer> GetBufferFromHandleLocked(const private_handle_t *hnd);
@@ -120,16 +89,10 @@
bool map_fb_mem_ = false;
Allocator *allocator_ = NULL;
std::mutex buffer_lock_;
- std::mutex descriptor_lock_;
- // TODO(user): The private_handle_t is used as a key because the unique ID generated
- // from next_id_ is not unique across processes. The correct way to resolve this would
- // be to use the allocator over hwbinder
- std::unordered_map<const private_handle_t*, std::shared_ptr<Buffer>> handles_map_ = {};
- std::unordered_map<gralloc1_buffer_descriptor_t,
- std::shared_ptr<BufferDescriptor>> descriptors_map_ = {};
+ std::unordered_map<const private_handle_t *, std::shared_ptr<Buffer>> handles_map_ = {};
std::atomic<uint64_t> next_id_;
};
-} // namespace gralloc1
+} // namespace gralloc
#endif // __GR_BUF_MGR_H__