diff options
| author | Sean Callanan <spyffe@google.com> | 2018-10-05 17:52:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-05 17:52:03 +0000 |
| commit | e2f073bb338b3485b9d11ceb1667d4da6701186d (patch) | |
| tree | a77309e5c052b4cec8919077419d8c75516bf74c /gralloc | |
| parent | 106db0d716e59be69f80eb88b4940fc2a9847911 (diff) | |
| parent | 57d535691169a0917de3b6b9d5c042b7f786438f (diff) | |
| download | display-e2f073bb338b3485b9d11ceb1667d4da6701186d.tar.gz | |
Merge "Revert "Gralloc: Disable AHardwareBuffer"" into pi-dev
Diffstat (limited to 'gralloc')
| -rw-r--r-- | gralloc/gr_adreno_info.cpp | 9 | ||||
| -rw-r--r-- | gralloc/gr_adreno_info.h | 1 | ||||
| -rw-r--r-- | gralloc/gr_utils.cpp | 5 | ||||
| -rw-r--r-- | gralloc/gralloc_priv.h | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp index c8c271c8..2df10ca6 100644 --- a/gralloc/gr_adreno_info.cpp +++ b/gralloc/gr_adreno_info.cpp @@ -87,11 +87,6 @@ AdrenoMemInfo::AdrenoMemInfo() { gfx_ubwc_disable_ = true; } - property_get(ENABLE_AHARDWAREBUFFER_PROP, property, "0"); - if (!(strncmp(property, "1", PROPERTY_VALUE_MAX)) || - !(strncmp(property, "true", PROPERTY_VALUE_MAX))) { - gfx_ahardware_buffer_enable_ = true; - } } AdrenoMemInfo::~AdrenoMemInfo() { @@ -269,10 +264,6 @@ uint32_t AdrenoMemInfo::AdrenoGetAlignedGpuBufferSize(void *metadata_blob) { } bool AdrenoMemInfo::AdrenoSizeAPIAvaliable() { - if (!gfx_ahardware_buffer_enable_) { - return false; - } - return (LINK_adreno_get_metadata_blob_size && LINK_adreno_init_memory_layout && LINK_adreno_get_aligned_gpu_buffer_size); } diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h index 74dade1e..c745cfee 100644 --- a/gralloc/gr_adreno_info.h +++ b/gralloc/gr_adreno_info.h @@ -188,7 +188,6 @@ class AdrenoMemInfo { uint32_t (*LINK_adreno_get_aligned_gpu_buffer_size)(void* metadata_blob) = NULL; bool gfx_ubwc_disable_ = false; - bool gfx_ahardware_buffer_enable_ = false; void *libadreno_utils_ = NULL; static AdrenoMemInfo *s_instance; diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp index bc15166b..4e12e01d 100644 --- a/gralloc/gr_utils.cpp +++ b/gralloc/gr_utils.cpp @@ -226,11 +226,6 @@ unsigned int GetSize(const BufferInfo &info, unsigned int alignedw, unsigned int int height = info.height; uint64_t usage = info.usage; - if ((usage & BufferUsage::GPU_MIPMAP_COMPLETE) || (usage & BufferUsage::GPU_CUBE_MAP)) { - ALOGE("Invalid GPU usage flags present 0x%" PRIx64, usage); - return 0; - } - if (IsUBwcEnabled(format, usage)) { size = GetUBwcSize(width, height, format, alignedw, alignedh); } else if (IsUncompressedRGBFormat(format)) { diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h index 2cc236af..be53d8bb 100644 --- a/gralloc/gralloc_priv.h +++ b/gralloc/gralloc_priv.h @@ -28,7 +28,6 @@ #define GRALLOC_PROP(prop_name) GRALLOC_PROP_PREFIX prop_name #define DISABLE_UBWC_PROP GRALLOC_PROP("disable_ubwc") -#define ENABLE_AHARDWAREBUFFER_PROP GRALLOC_PROP("enable_ahardware_buffer") #define ENABLE_FB_UBWC_PROP GRALLOC_PROP("enable_fb_ubwc") #define MAP_FB_MEMORY_PROP GRALLOC_PROP("map_fb_memory") |