diff options
| author | Gurchetan Singh <gurchetansingh@chromium.org> | 2019-06-04 16:53:54 -0700 |
|---|---|---|
| committer | Gurchetan Singh <gurchetansingh@chromium.org> | 2019-09-19 16:59:17 +0000 |
| commit | dc9b1204517ef9f2a8cdab4e03056bd51ed6fa70 (patch) | |
| tree | 57469137b888fa6b93e66af69bf7a98d96a001fe /rockchip.c | |
| parent | 5b91ec048176d9b9417075171912d1f9b7898f8a (diff) | |
| download | platform_external_minigbm-dc9b1204517ef9f2a8cdab4e03056bd51ed6fa70.tar.gz platform_external_minigbm-dc9b1204517ef9f2a8cdab4e03056bd51ed6fa70.tar.bz2 platform_external_minigbm-dc9b1204517ef9f2a8cdab4e03056bd51ed6fa70.zip | |
minigbm: rockchip/mediatek: remove R8 as texture source on Mali/Bifrost
EGL can't import this format on Mali/Bifrost.
BUG=chromium:969044
TEST=Ozone unit test
Change-Id: I356ec2bd35030af600b268bf39565e30e16465f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1643677
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Commit-Queue: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Diffstat (limited to 'rockchip.c')
| -rw-r--r-- | rockchip.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -27,8 +27,8 @@ static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMA DRM_FORMAT_BGR888, DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 }; -static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_NV12, - DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID }; +static const uint32_t texture_source_formats[] = { DRM_FORMAT_NV12, DRM_FORMAT_YVU420, + DRM_FORMAT_YVU420_ANDROID }; static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, uint32_t format) { @@ -139,8 +139,9 @@ static int rockchip_init(struct driver *drv) * R8 format is used for Android's HAL_PIXEL_FORMAT_BLOB and is used for JPEG snapshots * from camera. */ - drv_modify_combination(drv, DRM_FORMAT_R8, &metadata, - BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE); + drv_add_combination(drv, DRM_FORMAT_R8, &metadata, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SW_MASK | + BO_USE_LINEAR); kms_items = drv_query_kms(drv); if (!kms_items) |