diff options
author | Thierry Strudel <tstrudel@google.com> | 2017-09-15 10:46:48 -0700 |
---|---|---|
committer | Thierry Strudel <tstrudel@google.com> | 2017-09-19 15:35:13 +0000 |
commit | ef38dc2312f230e40047ac094bbbd5c0aaec2209 (patch) | |
tree | 59a90e5109143ba281e8c153b4d59a7d2ec608d3 | |
parent | bbc6f15a633f29d608acfc67c1a1fa5a0ecad8bc (diff) | |
download | display-ef38dc2312f230e40047ac094bbbd5c0aaec2209.tar.gz |
msm8998: Update to C1.07.00.00.375.020
msm8998: from hardware/qcom/display
b28746c3d libgrallocutils: Support defaults in AdrenoMemInfo
Test: build, boot, sanity checks
Bug: 65735819
Change-Id: I65db9818f6f5b88d7f3d7b899979ddb6abe9638f
Signed-off-by: Thierry Strudel <tstrudel@google.com>
-rw-r--r-- | msm8998/libgralloc1/gr_adreno_info.cpp | 5 | ||||
-rw-r--r-- | msm8998/libgralloc1/gr_allocator.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/msm8998/libgralloc1/gr_adreno_info.cpp b/msm8998/libgralloc1/gr_adreno_info.cpp index 59a6f5fa..1c833ed2 100644 --- a/msm8998/libgralloc1/gr_adreno_info.cpp +++ b/msm8998/libgralloc1/gr_adreno_info.cpp @@ -54,8 +54,7 @@ bool AdrenoMemInfo::Init() { *reinterpret_cast<void **>(&LINK_adreno_get_gpu_pixel_alignment) = ::dlsym(libadreno_utils_, "get_gpu_pixel_alignment"); } else { - ALOGE(" Failed to load libadreno_utils.so"); - return false; + ALOGW(" Failed to load libadreno_utils.so"); } // Check if the overriding property debug.gralloc.gfx_ubwc_disable_ @@ -141,6 +140,8 @@ void AdrenoMemInfo::AlignCompressedRGB(int width, int height, int format, unsign width, height, format, 0, raster_mode, padding_threshold, reinterpret_cast<int *>(aligned_w), reinterpret_cast<int *>(aligned_h), &bytesPerPixel); } else { + *aligned_w = (unsigned int)ALIGN(width, 32); + *aligned_h = (unsigned int)ALIGN(height, 32); ALOGW("%s: Warning!! compute_compressedfmt_aligned_width_and_height not found", __FUNCTION__); } } diff --git a/msm8998/libgralloc1/gr_allocator.cpp b/msm8998/libgralloc1/gr_allocator.cpp index 589f7729..899ba8e6 100644 --- a/msm8998/libgralloc1/gr_allocator.cpp +++ b/msm8998/libgralloc1/gr_allocator.cpp @@ -84,9 +84,7 @@ bool Allocator::Init() { } adreno_helper_ = new AdrenoMemInfo(); - if (!adreno_helper_->Init()) { - return false; - } + adreno_helper_->Init(); return true; } |