From 132d5c091bde74565066ce774ad2ee1afd634c26 Mon Sep 17 00:00:00 2001 From: Saurabh Shah Date: Mon, 12 Mar 2018 12:26:12 -0700 Subject: gralloc: Add some missing formats to GetGpuPixelFormat() Add some missing formats to GetGpuPixelFormat() Change-Id: Ic0689936f23ef353551a244edabc7260b8c04438 CRs-fixed: 2202759 --- gralloc/gr_adreno_info.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'gralloc') diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp index 6288a2ab..7b2d9b39 100644 --- a/gralloc/gr_adreno_info.cpp +++ b/gralloc/gr_adreno_info.cpp @@ -192,10 +192,27 @@ ADRENOPIXELFORMAT AdrenoMemInfo::GetGpuPixelFormat(int hal_format) { return ADRENO_PIXELFORMAT_R8G8B8A8; case HAL_PIXEL_FORMAT_RGBX_8888: return ADRENO_PIXELFORMAT_R8G8B8X8; + case HAL_PIXEL_FORMAT_BGRA_8888: + return ADRENO_PIXELFORMAT_B8G8R8A8; + case HAL_PIXEL_FORMAT_RGB_888: + return ADRENO_PIXELFORMAT_R8G8B8; case HAL_PIXEL_FORMAT_RGB_565: return ADRENO_PIXELFORMAT_B5G6R5; case HAL_PIXEL_FORMAT_BGR_565: return ADRENO_PIXELFORMAT_R5G6B5; + case HAL_PIXEL_FORMAT_RGBA_5551: + return ADRENO_PIXELFORMAT_R5G5B5A1; + case HAL_PIXEL_FORMAT_RGBA_4444: + return ADRENO_PIXELFORMAT_R4G4B4A4; + case HAL_PIXEL_FORMAT_RGBA_1010102: + return ADRENO_PIXELFORMAT_R10G10B10A2_UNORM; + case HAL_PIXEL_FORMAT_RGBX_1010102: + return ADRENO_PIXELFORMAT_R10G10B10X2_UNORM; + case HAL_PIXEL_FORMAT_ABGR_2101010: + return ADRENO_PIXELFORMAT_A2B10G10R10_UNORM; + case HAL_PIXEL_FORMAT_RGBA_FP16: + return ADRENO_PIXELFORMAT_R16G16B16A16_FLOAT; + case HAL_PIXEL_FORMAT_NV12_ENCODEABLE: return ADRENO_PIXELFORMAT_NV12; case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS: @@ -207,14 +224,6 @@ ADRENOPIXELFORMAT AdrenoMemInfo::GetGpuPixelFormat(int hal_format) { case HAL_PIXEL_FORMAT_YCbCr_420_P010_UBWC: case HAL_PIXEL_FORMAT_YCbCr_420_P010_VENUS: return ADRENO_PIXELFORMAT_P010; - case HAL_PIXEL_FORMAT_RGBA_1010102: - return ADRENO_PIXELFORMAT_R10G10B10A2_UNORM; - case HAL_PIXEL_FORMAT_RGBX_1010102: - return ADRENO_PIXELFORMAT_R10G10B10X2_UNORM; - case HAL_PIXEL_FORMAT_ABGR_2101010: - return ADRENO_PIXELFORMAT_A2B10G10R10_UNORM; - case HAL_PIXEL_FORMAT_RGBA_FP16: - return ADRENO_PIXELFORMAT_R16G16B16A16_FLOAT; default: ALOGE("%s: No map for format: 0x%x", __FUNCTION__, hal_format); break; -- cgit v1.2.3 From efd0917375e03f9abaf8ad7f7b2ad3965e5a5fbe Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Dhami Date: Wed, 28 Mar 2018 18:00:50 -0400 Subject: gralloc: Correct the gralloc private usage bit setting. Change-Id: Ic0f085bfbf516f031776ebb740b3c4a11c7264db --- gralloc/gralloc_priv.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gralloc') diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h index 1abf73bc..235f6984 100644 --- a/gralloc/gralloc_priv.h +++ b/gralloc/gralloc_priv.h @@ -42,18 +42,17 @@ inline int roundUpToPageSize(int x) { /* The bits below are in officially defined vendor space * i.e bits 28-31 and 48-63*/ /* Non linear, Universal Bandwidth Compression */ -#define GRALLOC_USAGE_PRIVATE_ALLOC_UBWC 1 << 28 +#define GRALLOC_USAGE_PRIVATE_ALLOC_UBWC (UINT32_C(1) << 28) /* Set this for allocating uncached memory (using O_DSYNC), * cannot be used with noncontiguous heaps */ -#define GRALLOC_USAGE_PRIVATE_UNCACHED 1 << 29 +#define GRALLOC_USAGE_PRIVATE_UNCACHED (UINT32_C(1) << 29) /* This flag is used to indicate P010 format */ -#define GRALLOC_USAGE_PRIVATE_10BIT 1 << 30 +#define GRALLOC_USAGE_PRIVATE_10BIT (UINT32_C(1) << 30) /* This flag is used for SECURE display usecase */ -#define GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY 1 << 31 - +#define GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY (UINT32_C(1) << 31) /* unused legacy flags */ #define GRALLOC_USAGE_PRIVATE_MM_HEAP 0 #define GRALLOC_USAGE_PRIVATE_IOMMU_HEAP 0 @@ -61,10 +60,10 @@ inline int roundUpToPageSize(int x) { /* TODO(user): move these to use sanctioned vendor bits * once end to end 64-bit support is available */ /* This flag is set for WFD usecase */ -#define GRALLOC_USAGE_PRIVATE_WFD 1 << 21 +#define GRALLOC_USAGE_PRIVATE_WFD (UINT32_C(1) << 21) /* This flag is used to indicate 10-bit tight pack format (e.g. TP10) */ -#define GRALLOC_USAGE_PRIVATE_10BIT_TP 1 << 27 +#define GRALLOC_USAGE_PRIVATE_10BIT_TP (UINT32_C(1) << 27) /* Legacy gralloc1 definitions */ /* Some clients may still be using the old flags */ -- cgit v1.2.3 From 67e17087757280f3297b3e821bf67159597023a8 Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Mon, 2 Apr 2018 17:28:51 -0400 Subject: display: More fixes for VNDK Change-Id: I8887ffdde3d6f39f9405dd38e8eaedbb8da2a9b4 --- gralloc/service.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'gralloc') diff --git a/gralloc/service.cpp b/gralloc/service.cpp index b19cc884..5832386b 100644 --- a/gralloc/service.cpp +++ b/gralloc/service.cpp @@ -26,7 +26,6 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "QtiAllocator.h" -- cgit v1.2.3 From e2aa5b165d8d04f33a07d3e18cd51bde72ffe540 Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Thu, 12 Apr 2018 12:43:27 -0400 Subject: gralloc: Remove map fb memory property This property is unused Change-Id: Id8f5c087b0dfa0eb3a31a342968abb687f0944c8 --- gralloc/gr_adreno_info.cpp | 11 ----------- gralloc/gr_adreno_info.h | 1 - gralloc/gr_buf_mgr.cpp | 9 --------- gralloc/gr_buf_mgr.h | 2 -- 4 files changed, 23 deletions(-) (limited to 'gralloc') diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp index 7b2d9b39..2098b615 100644 --- a/gralloc/gr_adreno_info.cpp +++ b/gralloc/gr_adreno_info.cpp @@ -81,11 +81,6 @@ AdrenoMemInfo::AdrenoMemInfo() { gfx_ubwc_disable_ = true; } - if ((property_get(MAP_FB_MEMORY_PROP, property, NULL) > 0) && - (!strncmp(property, "1", PROPERTY_VALUE_MAX) || - (!strncasecmp(property, "true", PROPERTY_VALUE_MAX)))) { - map_fb_ = true; - } } AdrenoMemInfo::~AdrenoMemInfo() { @@ -99,12 +94,6 @@ void AdrenoMemInfo::AlignUnCompressedRGB(int width, int height, int format, int *aligned_w = (unsigned int)ALIGN(width, 32); *aligned_h = (unsigned int)ALIGN(height, 32); - // Don't add any additional padding if debug.gralloc.map_fb_memory - // is enabled - if (map_fb_) { - return; - } - int bpp = 4; switch (format) { case HAL_PIXEL_FORMAT_RGB_888: diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h index a454d155..b85e7c1d 100644 --- a/gralloc/gr_adreno_info.h +++ b/gralloc/gr_adreno_info.h @@ -143,7 +143,6 @@ class AdrenoMemInfo { unsigned int (*LINK_adreno_get_gpu_pixel_alignment)() = NULL; bool gfx_ubwc_disable_ = false; - bool map_fb_ = false; void *libadreno_utils_ = NULL; static AdrenoMemInfo *s_instance; diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp index 21ebdcae..fadc8f0c 100644 --- a/gralloc/gr_buf_mgr.cpp +++ b/gralloc/gr_buf_mgr.cpp @@ -38,15 +38,6 @@ static BufferInfo GetBufferInfo(const BufferDescriptor &descriptor) { } BufferManager::BufferManager() : next_id_(0) { - char property[PROPERTY_VALUE_MAX]; - - // Map framebuffer memory - if ((property_get(MAP_FB_MEMORY_PROP, property, NULL) > 0) && - (!strncmp(property, "1", PROPERTY_VALUE_MAX) || - (!strncasecmp(property, "true", PROPERTY_VALUE_MAX)))) { - map_fb_mem_ = true; - } - handles_map_.clear(); allocator_ = new Allocator(); allocator_->Init(); diff --git a/gralloc/gr_buf_mgr.h b/gralloc/gr_buf_mgr.h index b8be0476..9fcca1b3 100644 --- a/gralloc/gr_buf_mgr.h +++ b/gralloc/gr_buf_mgr.h @@ -87,8 +87,6 @@ class BufferManager { // Get the wrapper Buffer object from the handle, returns nullptr if handle is not found std::shared_ptr GetBufferFromHandleLocked(const private_handle_t *hnd); - - bool map_fb_mem_ = false; Allocator *allocator_ = NULL; std::mutex buffer_lock_; std::unordered_map> handles_map_ = {}; -- cgit v1.2.3