commit b5e0f2d61b89fcb38de235594eafcdd4738f3669
author Bas Nieuwenhuizen <basni@chromium.org> Tue Sep 29 16:02:18 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Jan 20 08:47:31 2021 +0000
tree e8b7ca364649045da67218c7570c86c58a51fe6f
parent 8ff2bf873f6d4b5c84c7ae854ebaeb70df514952

amdgpu: Add P010 format.

BUG=b:169591197
TEST=Load http://crosvideo.appspot.com/?codec=vp9.2_30&loop=true&mute=true

Change-Id: I7f8b02b4809b6bae877c30aefdee03977abce9ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/2436746
Reviewed-by: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>

amdgpu.c

diff --git a/amdgpu.c b/amdgpu.c
index 93681cb..543e711 100644
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -53,9 +53,10 @@
 	DRM_FORMAT_ARGB2101010, DRM_FORMAT_XBGR2101010, DRM_FORMAT_XRGB2101010,
 };
 
-const static uint32_t texture_source_formats[] = { DRM_FORMAT_GR88,	      DRM_FORMAT_R8,
-						   DRM_FORMAT_NV21,	      DRM_FORMAT_NV12,
-						   DRM_FORMAT_YVU420_ANDROID, DRM_FORMAT_YVU420 };
+const static uint32_t texture_source_formats[] = {
+	DRM_FORMAT_GR88,	   DRM_FORMAT_R8,     DRM_FORMAT_NV21, DRM_FORMAT_NV12,
+	DRM_FORMAT_YVU420_ANDROID, DRM_FORMAT_YVU420, DRM_FORMAT_P010
+};
 
 static int query_dev_info(int fd, struct drm_amdgpu_info_device *dev_info)
 {
@@ -357,6 +358,9 @@
 			       BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SCANOUT |
 				   BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 
+	drv_modify_combination(drv, DRM_FORMAT_P010, &metadata,
+			       BO_USE_SCANOUT | BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
+
 	/* Android CTS tests require this. */
 	drv_add_combination(drv, DRM_FORMAT_BGR888, &metadata, BO_USE_SW_MASK);