diff options
| author | Jason Macnak <natsu@google.com> | 2020-07-09 13:39:18 -0700 |
|---|---|---|
| committer | Jason Macnak <natsu@google.com> | 2020-07-09 13:49:25 -0700 |
| commit | cbd768f2b30664f32cede8a982a9996fa28079d0 (patch) | |
| tree | 10929e24280bd245cc6b8abf2a03f0c054234a71 | |
| parent | b26e66e866ae5359c37a218601cc8990c32496e5 (diff) | |
| download | platform_external_minigbm-cbd768f2b30664f32cede8a982a9996fa28079d0.tar.gz platform_external_minigbm-cbd768f2b30664f32cede8a982a9996fa28079d0.tar.bz2 platform_external_minigbm-cbd768f2b30664f32cede8a982a9996fa28079d0.zip | |
cros_gralloc: makes flex format use RGBXandroid-r-beta-3android-r-beta-2
Cuttlefish's current camera hal and emulated camera implementation
assumes that HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED is RGBA.
Note: this will be Android specific change and will not upstream
and this change should be reverted when the new hal and emulated
camera implementation lands.
Bug: b/157902551
Test: cts -m CtsCameraTestCases
Change-Id: Ifb4f37a66e1bc012790b45c7c10d491c039bd58c
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
| -rw-r--r-- | virtio_gpu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/virtio_gpu.c b/virtio_gpu.c index 4e83366..f7cf015 100644 --- a/virtio_gpu.c +++ b/virtio_gpu.c @@ -868,10 +868,9 @@ static uint32_t virtio_gpu_resolve_format(struct driver *drv, uint32_t format, u { switch (format) { case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: - /* Camera subsystem requires NV12. */ - if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE)) - return DRM_FORMAT_NV12; - /*HACK: See b/28671744 */ + // TODO(b/157902551): Cuttlefish's current camera hal implementation + // requires that the flex format is RGBA. Revert this edit and use YUV + // format when Cuttlefish switches to the newer camera hal. return DRM_FORMAT_XBGR8888; case DRM_FORMAT_FLEX_YCbCr_420_888: /* |