Allocate tiling for layer buffer, linear for frame buffer

Only set scanout flag when have COMPOSER_CLIENT_TARGET and GRALLOC_USAGE_PRIVATE_0 flag. Signed-off-by: HeYue <[email protected]>
projectceladon · May 30, 2024 · 0ebac5a · 0ebac5a
1 parent 25ab5b0
commit 0ebac5a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc
@@ -26,6 +26,9 @@
 /* Define to match AIDL PixelFormat::R_8. */
 #define HAL_PIXEL_FORMAT_R8 0x38
 
+/* Define to match BufferUsage::GRALLOC_USAGE_PRIVATE_0. */
+#define GRALLOC_USAGE_PRIVATE_0 (1 << 28)
+
 const char *drmFormat2Str(int drm_format)
 {
 	static char buf[5];
@@ -138,8 +141,8 @@ uint64_t cros_gralloc_convert_usage(uint64_t usage)
 	handle_usage(&usage, GRALLOC_USAGE_HW_RENDER, &use_flags, BO_USE_RENDERING);
 	handle_usage(&usage, GRALLOC_USAGE_HW_2D, &use_flags, BO_USE_RENDERING);
 	/* HWC wants to use display hardware, but can defer to OpenGL. */
-	handle_usage(&usage, GRALLOC_USAGE_HW_COMPOSER, &use_flags,
-		     BO_USE_SCANOUT | BO_USE_TEXTURE);
+	handle_usage(&usage, GRALLOC_USAGE_HW_COMPOSER, &use_flags, BO_USE_TEXTURE);
+	handle_usage(&usage, (GRALLOC_USAGE_HW_FB |GRALLOC_USAGE_PRIVATE_0), &use_flags, BO_USE_SCANOUT);
 	handle_usage(&usage, GRALLOC_USAGE_HW_FB, &use_flags, BO_USE_NONE);
 	/*
 	 * This flag potentially covers external display for the normal drivers (i915/rockchip) and