From 123cdb0fa4b5092fbeb7b19cab41d1a5baf04467 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Wed, 29 Sep 2021 12:47:00 +0300 Subject: [PATCH] drm_hwcomposer: Remove unused ResourceManager::gralloc_ field It was added with initial ResourceManager implementation and was never used. Signed-off-by: Roman Stratiienko --- drm/ResourceManager.cpp | 9 ++------- drm/ResourceManager.h | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drm/ResourceManager.cpp b/drm/ResourceManager.cpp index 224e709..76a36e1 100644 --- a/drm/ResourceManager.cpp +++ b/drm/ResourceManager.cpp @@ -29,7 +29,7 @@ namespace android { -ResourceManager::ResourceManager() : num_displays_(0), gralloc_(nullptr) { +ResourceManager::ResourceManager() : num_displays_(0) { } int ResourceManager::Init() { @@ -70,8 +70,7 @@ int ResourceManager::Init() { return -EINVAL; } - return hw_get_module(GRALLOC_HARDWARE_MODULE_ID, - (const hw_module_t **)&gralloc_); + return 0; } int ResourceManager::AddDrmDevice(const std::string &path) { @@ -126,8 +125,4 @@ DrmDevice *ResourceManager::GetDrmDevice(int display) { } return nullptr; } - -const gralloc_module_t *ResourceManager::gralloc() { - return gralloc_; -} } // namespace android diff --git a/drm/ResourceManager.h b/drm/ResourceManager.h index 9b4155b..5b7a049 100644 --- a/drm/ResourceManager.h +++ b/drm/ResourceManager.h @@ -31,7 +31,6 @@ class ResourceManager { ResourceManager &operator=(const ResourceManager &) = delete; int Init(); DrmDevice *GetDrmDevice(int display); - const gralloc_module_t *gralloc(); DrmConnector *AvailableWritebackConnector(int display); const std::vector> &getDrmDevices() const { return drms_; @@ -49,7 +48,6 @@ class ResourceManager { int num_displays_; std::vector> drms_; - const gralloc_module_t *gralloc_; bool scale_with_gpu_{}; }; -- 2.11.0