diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-01-26 03:26:09 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-01-26 03:26:09 -0800 |
| commit | acdc3dac45d70aef0d1d3b10f2d59ec1fd43c2ad (patch) | |
| tree | a94886d06d7e02a3ad6266a4efae242128e5a007 | |
| parent | ac26cc78fd0f3b7cb5f61a14bc29bcbddada4cec (diff) | |
| parent | 2d51d4113552f789440cc8455f022b7f65e3361a (diff) | |
Merge 2d51d4113552f789440cc8455f022b7f65e3361a on remote branch
Change-Id: Idea7fcf51b781fa472560092071517e4a4cc6e76
| -rw-r--r-- | config/display-interfaces-product.mk | 10 | ||||
| -rw-r--r-- | config/display-product-system.mk | 10 | ||||
| -rw-r--r-- | gralloc/QtiGrallocDefs.h | 22 |
3 files changed, 22 insertions, 20 deletions
diff --git a/config/display-interfaces-product.mk b/config/display-interfaces-product.mk index a432de96..d7b7d931 100644 --- a/config/display-interfaces-product.mk +++ b/config/display-interfaces-product.mk @@ -22,8 +22,8 @@ PRODUCT_PACKAGES += vendor.qti.hardware.display.allocator@1.0.vendor \ vendor.qti.hardware.display.mapper@4.0.vendor \ vendor.qti.hardware.display.mapperextensions@1.0.vendor \ vendor.qti.hardware.display.mapperextensions@1.1.vendor \ - vendor.qti.hardware.display.config-V1-ndk_platform.vendor \ - vendor.qti.hardware.display.config-V2-ndk_platform.vendor \ - vendor.qti.hardware.display.config-V3-ndk_platform.vendor \ - vendor.qti.hardware.display.config-V4-ndk_platform.vendor \ - vendor.qti.hardware.display.config-V5-ndk_platform.vendor + vendor.qti.hardware.display.config-V1-ndk.vendor \ + vendor.qti.hardware.display.config-V2-ndk.vendor \ + vendor.qti.hardware.display.config-V3-ndk.vendor \ + vendor.qti.hardware.display.config-V4-ndk.vendor \ + vendor.qti.hardware.display.config-V5-ndk.vendor diff --git a/config/display-product-system.mk b/config/display-product-system.mk index 3675f06a..80fae024 100644 --- a/config/display-product-system.mk +++ b/config/display-product-system.mk @@ -4,11 +4,11 @@ PRODUCT_PACKAGES += vendor.display.config@1.0 \ vendor.display.config@1.3 \ vendor.display.config@1.4 \ vendor.display.config@1.5 \ - vendor.qti.hardware.display.config-V1-ndk_platform \ - vendor.qti.hardware.display.config-V2-ndk_platform \ - vendor.qti.hardware.display.config-V3-ndk_platform \ - vendor.qti.hardware.display.config-V4-ndk_platform \ - vendor.qti.hardware.display.config-V5-ndk_platform + vendor.qti.hardware.display.config-V1-ndk \ + vendor.qti.hardware.display.config-V2-ndk \ + vendor.qti.hardware.display.config-V3-ndk \ + vendor.qti.hardware.display.config-V4-ndk \ + vendor.qti.hardware.display.config-V5-ndk SOONG_CONFIG_NAMESPACES += qtiunifeddraw # Soong Keys diff --git a/gralloc/QtiGrallocDefs.h b/gralloc/QtiGrallocDefs.h index 6ad2213e..d37f327e 100644 --- a/gralloc/QtiGrallocDefs.h +++ b/gralloc/QtiGrallocDefs.h @@ -54,27 +54,29 @@ /* This flag is used for SECURE display usecase */ #define GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY (UINT32_C(1) << 31) -/* This flag is used to indicate video NV21 format */ -#define GRALLOC_USAGE_PRIVATE_VIDEO_NV21_ENCODER 1ULL << 48 - /* unused legacy flags */ #define GRALLOC_USAGE_PRIVATE_MM_HEAP 0 #define GRALLOC_USAGE_PRIVATE_IOMMU_HEAP 0 - -/* This flag is set for WFD usecase */ -#define GRALLOC_USAGE_PRIVATE_WFD 1ULL << 51 +#define GRALLOC_USAGE_PRIVATE_10BIT_TP 0 /* This flag is set for HEIF usecase */ #define GRALLOC_USAGE_PRIVATE_HEIF (UINT32_C(1) << 27) -/* TODO(user): Remove when clients stop referencing this flag */ -#define GRALLOC_USAGE_PRIVATE_10BIT_TP 0 +/* This flag is used to indicate video NV21 format */ +#define GRALLOC_USAGE_PRIVATE_VIDEO_NV21_ENCODER 1ULL << 48 /* This flag indicates PI format is being used */ -#define GRALLOC_USAGE_PRIVATE_ALLOC_UBWC_PI 1ULL << 49 +#define GRALLOC_USAGE_PRIVATE_ALLOC_UBWC_PI 1ULL << 49 /* This flag is set while CDSP accesses the buffer */ -#define GRALLOC_USAGE_PRIVATE_CDSP 1ULL << 50 +#define GRALLOC_USAGE_PRIVATE_CDSP 1ULL << 50 + +/* This flag is set for WFD usecase */ +#define GRALLOC_USAGE_PRIVATE_WFD 1ULL << 51 + +/* This flag indicates video HW usage */ +#define GRALLOC_USAGE_PRIVATE_VIDEO_HW 1ULL << 52 + // OEM specific HAL formats #define HAL_PIXEL_FORMAT_RGBA_5551 6 |