Revert "Enable to allocate XBGR8888 with HW_VIDEO_ENCODER usage"

This reverts commit aa6b072d4ce2d445e48b9978ac3f0bc73cd97176.

Reason for revert: This change is unnecessary because HW_VIDEO_ENCODER
usage is unmasked in crrev.com/c/1940034.

Original change's description:
> Enable to allocate XBGR8888 with HW_VIDEO_ENCODER usage
>
> crrev.com/c/1904910 masks the HW_VIDEO_ENCODER usage when
> BO_USE_HW_VIDEO_ENCODER is specified in gralloc. A camera stack allocates
> XBGR8888 buffer with BO_USE_HW_VIDEO_ENCODER usage in ARC++ video
> recording if the camera HAL version is V1. Thanks to crrev.com/c/1904910,
> it is necessary to enable to allocate XBGR8888 with HW_VIDEO_ENCODER usage.
>
> BUG=b:144135251
> TEST=Recording with GCA
>
> Change-Id: I61beee87a1531c0dea371861ffb31ce2189ef854
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1934068
> Tested-by: Hirokazu Honda <hiroh@chromium.org>
> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
> Commit-Queue: Hirokazu Honda <hiroh@chromium.org>

Bug: b:144135251
Cq-Depend: chromium:1940034
Change-Id: I8d64c97399a601487fc84a6ecae337c235bd4464
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1947685
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Auto-Submit: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>

diff --git a/i915.c b/i915.c
index 3485c83..025b6b5 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -151,13 +151,6 @@ static int i915_add_combinations(struct driver *drv)
        drv_modify_combination(drv, DRM_FORMAT_NV12, &metadata,
                               BO_USE_HW_VIDEO_ENCODER | BO_USE_HW_VIDEO_DECODER);
 
-       /*
-        * Camera buffers are allocated with GRALLOC_USAGE_HW_VIDEO_ENCODER, and the camera stack
-        * selects XBGR8888 in ARC++ video recording if the camera HAL is V1. So we need to be able
-        * to allocate this format.
-        */
-       drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, BO_USE_HW_VIDEO_ENCODER);
-
        /* Android CTS tests require this. */
        drv_add_combination(drv, DRM_FORMAT_BGR888, &metadata, BO_USE_SW_MASK);
 

diff --git a/mediatek.c b/mediatek.c
index 9adec5c..6d77970 100644 (file)
--- a/mediatek.c
+++ b/mediatek.c
@@ -63,13 +63,6 @@ static int mediatek_init(struct driver *drv)
        drv_modify_combination(drv, DRM_FORMAT_YVU420, &LINEAR_METADATA, BO_USE_HW_VIDEO_ENCODER);
        drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA, BO_USE_HW_VIDEO_ENCODER);
 
-       /*
-        * Camera buffers are allocated with GRALLOC_USAGE_HW_VIDEO_ENCODER, and the camera stack
-        * selects XBGR8888 in ARC++ video recording if the camera HAL is V1. So we need to be able
-        * to allocate this format.
-        */
-       drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, BO_USE_HW_VIDEO_ENCODER);
-
        /* Android CTS tests require this. */
        drv_add_combination(drv, DRM_FORMAT_BGR888, &LINEAR_METADATA, BO_USE_SW_MASK);
 

diff --git a/rockchip.c b/rockchip.c
index dfa25a8..43cbfe2 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -129,13 +129,6 @@ static int rockchip_init(struct driver *drv)
        drv_modify_combination(drv, DRM_FORMAT_YVU420, &metadata, BO_USE_HW_VIDEO_ENCODER);
        drv_modify_combination(drv, DRM_FORMAT_NV12, &metadata, BO_USE_HW_VIDEO_ENCODER);
 
-       /*
-        * Camera buffers are allocated with GRALLOC_USAGE_HW_VIDEO_ENCODER, and the camera stack
-        * selects XBGR8888 in ARC++ video recording if the camera HAL is V1. So we need to be able
-        * to allocate this format.
-        */
-       drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &metadata, BO_USE_HW_VIDEO_ENCODER);
-
        drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);
        drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);