Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/tm-dev'
... to update Minigbm for Goldfish to pull in P010 support from
https://crrev.com/c/3579857
Bug: b/191084459
Test: cvd start --gpu_mode=gfxstream
Test: Camera2Video sample app
Test: cts -m CtsCameraTestCases
Change-Id: I1257909949c4831fbbc3064cea269c429da16748
(cherry picked from commit 722a08bb8ac941fb2a077b63673a805c5527c651)
Merged-In: I1257909949c4831fbbc3064cea269c429da16748
diff --git a/amdgpu.c b/amdgpu.c
index 700a8c7..7ff61a4 100644
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -517,10 +517,10 @@
* aligned. This uses more memory than necessary since the first plane only needs to be
* 256 aligned, but it's acceptable for a short-term fix. It's probably safe for other gpu
* families, but let's restrict it to Raven and Stoney for now (b/171013552, b/190484589).
+ * This only applies to the Android YUV (multiplane) format.
* */
- if (num_planes > 1 &&
- (priv->dev_info.family == AMDGPU_FAMILY_RV ||
- (priv->dev_info.family == AMDGPU_FAMILY_CZ && !(use_flags & BO_USE_HW_VIDEO_ENCODER))))
+ if (format == DRM_FORMAT_YVU420_ANDROID &&
+ (priv->dev_info.family == AMDGPU_FAMILY_RV || priv->dev_info.family == AMDGPU_FAMILY_CZ))
stride = ALIGN(stride, 512);
else
stride = ALIGN(stride, 256);