Merge "gralloc1: Rename property to disable ubwc for graphics"
diff --git a/libgralloc1/gr_adreno_info.cpp b/libgralloc1/gr_adreno_info.cpp
index 6de5157..1d0ed48 100644
--- a/libgralloc1/gr_adreno_info.cpp
+++ b/libgralloc1/gr_adreno_info.cpp
@@ -62,6 +62,8 @@
if (libadreno_utils_) {
*reinterpret_cast<void **>(&LINK_adreno_compute_aligned_width_and_height) =
::dlsym(libadreno_utils_, "compute_aligned_width_and_height");
+ *reinterpret_cast<void **>(&LINK_adreno_compute_fmt_aligned_width_and_height) =
+ ::dlsym(libadreno_utils_, "compute_fmt_aligned_width_and_height");
*reinterpret_cast<void **>(&LINK_adreno_compute_padding) =
::dlsym(libadreno_utils_, "compute_surface_padding");
*reinterpret_cast<void **>(&LINK_adreno_compute_compressedfmt_aligned_width_and_height) =
@@ -129,7 +131,15 @@
int padding_threshold = 512; // Threshold for padding surfaces.
// the function below computes aligned width and aligned height
// based on linear or macro tile mode selected.
- if (LINK_adreno_compute_aligned_width_and_height) {
+ if (LINK_adreno_compute_fmt_aligned_width_and_height) {
+ // We call into adreno_utils only for RGB formats. So plane_id is 0 and
+ // num_samples is 1 always. We may have to add uitility function to
+ // find out these if there is a need to call this API for YUV formats.
+ LINK_adreno_compute_fmt_aligned_width_and_height(
+ width, height, 0/*plane_id*/, GetGpuPixelFormat(format), 1/*num_samples*/,
+ tile_enabled, raster_mode, padding_threshold,
+ reinterpret_cast<int *>(aligned_w), reinterpret_cast<int *>(aligned_h));
+ } else if (LINK_adreno_compute_aligned_width_and_height) {
LINK_adreno_compute_aligned_width_and_height(
width, height, bpp, tile_enabled, raster_mode, padding_threshold,
reinterpret_cast<int *>(aligned_w), reinterpret_cast<int *>(aligned_h));
@@ -141,6 +151,7 @@
} else {
ALOGW(
"%s: Warning!! Symbols compute_surface_padding and "
+ "compute_fmt_aligned_width_and_height and "
"compute_aligned_width_and_height not found",
__FUNCTION__);
}
diff --git a/libgralloc1/gr_adreno_info.h b/libgralloc1/gr_adreno_info.h
index 1c85c8c..75ba507 100644
--- a/libgralloc1/gr_adreno_info.h
+++ b/libgralloc1/gr_adreno_info.h
@@ -131,6 +131,11 @@
int tile_mode, int raster_mode,
int padding_threshold, int *aligned_w,
int *aligned_h) = NULL;
+ void (*LINK_adreno_compute_fmt_aligned_width_and_height)(int width, int height, int plane_id,
+ int format, int num_samples,
+ int tile_mode, int raster_mode,
+ int padding_threshold, int *aligned_w,
+ int *aligned_h) = NULL;
void (*LINK_adreno_compute_compressedfmt_aligned_width_and_height)(
int width, int height, int format, int tile_mode, int raster_mode, int padding_threshold,
int *aligned_w, int *aligned_h, int *bpp) = NULL;
diff --git a/sdm/include/private/color_params.h b/sdm/include/private/color_params.h
index f1e819e..0a53832 100644
--- a/sdm/include/private/color_params.h
+++ b/sdm/include/private/color_params.h
@@ -37,6 +37,8 @@
#include <core/sdm_types.h>
#include <core/display_interface.h>
+#include <string>
+
#include "hw_info_types.h"
namespace sdm {
diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index a7eacd2..d30e0f3 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -827,7 +827,7 @@
return error;
}
-DisplayError DisplayBase::GetValueOfModeAttribute(const AttrVal &attr,const std::string &type,
+DisplayError DisplayBase::GetValueOfModeAttribute(const AttrVal &attr, const std::string &type,
std::string *value) {
if (!value) {
return kErrorParameters;
diff --git a/sdm/libs/hwc2/hwc_buffer_allocator.cpp b/sdm/libs/hwc2/hwc_buffer_allocator.cpp
index b7fcac3..bdebc22 100644
--- a/sdm/libs/hwc2/hwc_buffer_allocator.cpp
+++ b/sdm/libs/hwc2/hwc_buffer_allocator.cpp
@@ -165,7 +165,7 @@
producer_usage = gralloc1_producer_usage_t(alloc_flags);
consumer_usage = gralloc1_consumer_usage_t(alloc_flags);
gralloc1::BufferInfo info(width, height, format, producer_usage, consumer_usage);
- GetBufferSizeAndDimensions(info, &aligned_width, &aligned_height, &buffer_size);
+ GetBufferSizeAndDimensions(info, &buffer_size, &aligned_width, &aligned_height);
return buffer_size;
}
@@ -312,7 +312,7 @@
producer_usage = gralloc1_producer_usage_t(alloc_flags);
consumer_usage = gralloc1_consumer_usage_t(alloc_flags);
gralloc1::BufferInfo info(width, height, format, producer_usage, consumer_usage);
- GetBufferSizeAndDimensions(info, &aligned_width, &aligned_height, &buffer_size);
+ GetBufferSizeAndDimensions(info, &buffer_size, &aligned_width, &aligned_height);
allocated_buffer_info->stride = UINT32(aligned_width);
allocated_buffer_info->aligned_width = UINT32(aligned_width);
allocated_buffer_info->aligned_height = UINT32(aligned_height);