OSDN Git Service
Jason Macnak [Fri, 18 Sep 2020 16:07:51 +0000 (09:07 -0700)]
Merge remote-tracking branch 'aosp/upstream-master' into HEAD
... to update Minigbm for Cuttlefish to have Gralloc3 and
Gralloc4 support.
Bug: b/
161909468
Test: launch_cvd
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: I11e31543d3298c2cac67d80e77058d7cd95907db
Jason Macnak [Fri, 18 Sep 2020 15:59:40 +0000 (08:59 -0700)]
Revert "Merge Android R"
This reverts commit
25ff66748d4b08e7059aad06d967128681838fd4, reversing
changes made to
8884508fa662f8e2b11ea1639006fb0e17d65483.
Bug: b/
161909468
Test: launch_cvd
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: I9929f68d173fb4d11ca1983a3b4a67dabdd35cf8
David Stevens [Thu, 10 Sep 2020 01:50:26 +0000 (10:50 +0900)]
virtgpu: improve blob support on ARCVM
This change expands the types of buffers which use blob allocation, to
cover decoder/encoder bitstream buffers. It also adds tiling to the
exported buffer metadata, so that flush/invalidate are properly skipped
on imported blob buffers.
BUG=None
TEST=tast run ARCVM-DUT arc.VideoDecodeAccel.*
Change-Id: I460f4448db9e1bd2f7458f3180c4e92ff3b3d74f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2400839
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: David Stevens <stevensd@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
Jason Macnak [Thu, 10 Sep 2020 17:57:46 +0000 (10:57 -0700)]
minigbm: Adds Gralloc 4 support
Implements the Allocator 4.0 and Mapper 4.0 interfaces.
Some notable features of the 4.0 interface:
- buffer metadata getter/setters
- buffer flushing
- buffer debugging (buffer listing and buffer id)
BUG=b:
161909468
TEST=build and launch Cuttlefish with Gralloc4
Change-Id: I63bdc76604207e1fcfe0135c9b64fa62bfba5b27
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2404601
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Jason Macnak [Thu, 10 Sep 2020 17:51:47 +0000 (10:51 -0700)]
minigbm: Remove Android.bp files
These files quickly become out of sync with Android specific
build changes so just drop them from upstream Chromium repo.
BUG=b:
161909468
TEST=build Cuttlefish
Change-Id: Icf4e3eb708e13ba6c807fcc7d0abe06572d341c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2404600
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Fritz Koenig [Wed, 9 Sep 2020 22:22:46 +0000 (15:22 -0700)]
minigbm/msm: Correct NV12 UBWC buffer allocation
V4L2 is the consumer of these buffers and sets up
the allocation in get_framesize_raw_nv12_ubwc().
There was a mismatch where V4L2 was aligning the
uv buffer differently than minigbm.
BUG=b:
166157708
TEST=video_decode_accelerator_tests with 856x480 video
Change-Id: Idb9fb689a56639dbc73753d453e7e6e5daeb6700
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2402146
Tested-by: Fritz Koenig <frkoenig@chromium.org>
Commit-Queue: Fritz Koenig <frkoenig@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Gurchetan Singh [Tue, 24 Mar 2020 18:05:03 +0000 (11:05 -0700)]
minigbm: remove gbm_bo_map(..) discrepancy
We can now use the upstream gbm_bo_map(..) prototype.
BUG=b:
145747350
TEST=compile
Change-Id: Ic3e25ebad903da29be4eb085e5a46bf8109de63f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2118475
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
Reviewed-by: Lepton Wu <lepton@chromium.org>
Kristian H. Kristensen [Tue, 8 Sep 2020 03:28:23 +0000 (03:28 +0000)]
msm: Clear all sw use flags for UBWC combinations
Whether rarely or often, we can't support any kind of sw access if the
buffer is UBWC compressed. We could potentially add support for
blitting in and out of the buffer, but for now just allocate linear.
BUG=b:
167934919
TEST=Buffers allocated with any SW access use flag don't get UBWC
Change-Id: Ic9c1d86a124e24b7bc4aa259c62d8c4882c487b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2397084
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Kristian H. Kristensen <hoegsberg@chromium.org>
Xin Li [Tue, 8 Sep 2020 23:54:40 +0000 (16:54 -0700)]
Merge Android R
Bug:
168057903
Merged-In: I8d7971fe52ff43b175a9821c97a6f3c6d380a01d
Change-Id: Ifc3303bb699d1383828b9f323990bcbf301cffcc
Boleyn Su [Fri, 21 Aug 2020 03:31:49 +0000 (12:31 +0900)]
minigbm: add O_CLOEXEC for the opened fd
BUG=b:
162475183
TEST=None
Change-Id: Ic7debb48874ad90509954f7138e33a9d88da4898
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2368693
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Lepton Wu <lepton@chromium.org>
Tested-by: Boleyn Su <boleynsu@chromium.org>
Auto-Submit: Boleyn Su <boleynsu@chromium.org>
Commit-Queue: Boleyn Su <boleynsu@chromium.org>
Xin Li [Tue, 1 Sep 2020 20:03:53 +0000 (20:03 +0000)]
Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@
6692709)" into stage-aosp-master
Alistair Delva [Tue, 1 Sep 2020 00:09:17 +0000 (00:09 +0000)]
ANDROID: Add target/device support am:
8884508fa6
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1414810
Change-Id: I8d7971fe52ff43b175a9821c97a6f3c6d380a01d
Alistair Delva [Fri, 28 Aug 2020 20:42:24 +0000 (13:42 -0700)]
ANDROID: Add target/device support
Support building libgbm.so for an Android guest.
Change-Id: I1f9d729f847ad9bdd3c8746681e0df00c2107419
Gurchetan Singh [Sat, 14 Sep 2019 00:49:20 +0000 (17:49 -0700)]
minigbm: virtgpu: add resource create blob function
Some SW intensive apps could benefit from this.
This should decrease power consumption when playing a Youtube
1080p60fps video by 10%.
BUG=chromium:924405
TEST=mmap_test
Change-Id: I80bb08a95b7387eb8af58e1f0d30beb695fc3e74
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
1804914
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Lingfeng Yang <lfy@google.com>
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Alistair Delva [Sat, 29 Aug 2020 17:26:29 +0000 (17:26 +0000)]
Avoid pulling libdrm.so from the AOSP host build am:
70742d1caa
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1414808
Change-Id: I243a273721b8a45beacfb280bcd89ec39911c64f
Alistair Delva [Fri, 28 Aug 2020 17:28:11 +0000 (10:28 -0700)]
Avoid pulling libdrm.so from the AOSP host build
When binaries depending on minigbm/gbm on the host are linked to it, it
will cause libdrm.so to be taken from the host build done by the Android
build system (i.e. out/host/linux-x86/lib64/libdrm.so), but usually this
library is used with binary GPU drivers that are built out-of-tree, and
they will use the libdrm.so from the host system
(i.e. /usr/lib/x86_64-linux-gnu/libdrm.so.2). As libdrm uses globals to
store things like the ctx hashtable, only one libdrm.so can be loaded
into memory at the same time, or weird crashes in drmClose() and other
drm API functions will occur.
This workaround is only applied to the host "libgbm.so" target, which is
only used by crosvm currently.
Change-Id: Iedcb65d9a031220d8c095fd54a1b967647eb537c
Xin Li [Fri, 28 Aug 2020 01:46:51 +0000 (18:46 -0700)]
Merge Android R (rvc-dev-plus-aosp-without-vendor@
6692709)
Bug:
166295507
Merged-In: Id6c11d1f63223260f5e71ea00b6499164c019abd
Change-Id: I756978f9fcd81c1ac4d6ac39dd4ade23ee05c443
Gurchetan Singh [Fri, 3 Apr 2020 22:15:30 +0000 (15:15 -0700)]
minigbm: virtgpu: add virgl_protocol.h, add external directory
This adds Mesa protocol headers for BLOB resources. Also some
code movement. See:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4821
for another example.
BUG=chromium:924405
TEST=compile
Change-Id: I330851e6a58d4e12be8e0e882a230a1cca83e7a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
1804828
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Kristian H. Kristensen [Wed, 26 Aug 2020 00:26:24 +0000 (00:26 +0000)]
Revert "msm: Disable UBWC briefly while we land the ARC++ modifier support"
This reverts commit
8e2ae67794c69a25308ffdb6f33ef771c75a97dd. With the
uprev from CL:
2375596, we have support for modifiers all the way from
ARC++, through EGL and exo to KMS and can re-enable UBWC.
BUG=b:
145579089, b:
79682290, b:
163562363
TEST=Once UBWC is enabled again in minigbm, ARC++ buffers should be UBWC
compressed.
Cq-Depend: chromium:
2375596
Change-Id: Iec9bb6f2057eb897fe119750f6a961bbefb871af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2375673
Reviewed-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Commit-Queue: Rob Clark <robdclark@chromium.org>
Gurchetan Singh [Thu, 20 Aug 2020 21:25:43 +0000 (14:25 -0700)]
minigbm: run presubmit.sh
It's good to do this every once and a while.
Change-Id: Ief71a50e07a51e2ac1b66daf1ed0c8b9129d9c1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2368212
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Kristian H. Kristensen [Wed, 12 Aug 2020 22:16:33 +0000 (15:16 -0700)]
cros_gralloc: Add new perform op for getting buffer info
This perform op gives us all the underlying info about the BO, which
lets us import multiplane BOs (such as Intel compressed BOs). This
eliminates a lot of guessing and fudging in EGL and wayland_service
when trying to determine this info from the Android handle.
This generalizes the GET_MODIFIER op, which nothing was using yet.
BUG=b:
145579089, b:
79682290. b:
163562363
TEST=arc++ apps using non-linear format layouts
Change-Id: I821e14477d35794b7247fab59649f564e8ff6985
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2353750
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Commit-Queue: Kristian H. Kristensen <hoegsberg@chromium.org>
Kristian H. Kristensen [Wed, 12 Aug 2020 22:12:44 +0000 (15:12 -0700)]
msm: Disable UBWC briefly while we land the ARC++ modifier support
BUG=b:
145579089, b:
79682290. b:
163562363
TEST=Verify that UBWC is off (eg /sys/kernel/debug/dri/1/state)
Change-Id: Icc62960ea12c30bfa709e358ec1cfb097333e6fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2353749
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Commit-Queue: Kristian H. Kristensen <hoegsberg@chromium.org>
Wei Lee [Wed, 5 Aug 2020 09:24:45 +0000 (17:24 +0800)]
minigbm: Use NV12 for video decoder on MT8183 only
To unblock the HALv3 camera migration for MT8173 platform, we changed to
use NV12 for camera read/write, video hw encoder/decoder for
DRM_FORMAT_FLEX_YCbCr_420_888 format on MT8173 in crrev.com/c/
2317328.
However, it broke V4L2 VDA since it does not support NV12, as per
b:
162698479.
Since camera will not use video decoder actually, change MT8173
back to use YVU420 for video decoder.
BUG=b:
162698479
TEST=tast run [DUT] arc.VideoDecodeAccel.h264
Change-Id: Iee83ab0184541b24ecc9e4fb07138c09228e5440
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2336352
Tested-by: Wei Lee <wtlee@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Auto-Submit: Wei Lee <wtlee@chromium.org>
Rob Clark [Fri, 7 Aug 2020 15:08:30 +0000 (08:08 -0700)]
minigbm/msm: Add workaround for waffle
Waffle does not support modifiers, detect it and fall back to linear
buffers. Fixes glmark2-waffle, glbench/windowmanagertest, etc.
BUG=b:
158238296, b:
153675943
TEST=run glmark2-waffle and verify it displays correct
TEST=run graphics.Sanity and verify that it passes
TEST=start ui and verify that it still picks UBWC modifier
Change-Id: I591136c8d07bd32beb6f4efa63971821193ce39e
Exempt-From-Owner-Approval: already CR+2 from owner
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2343173
Tested-by: Rob Clark <robdclark@chromium.org>
Commit-Queue: Rob Clark <robdclark@chromium.org>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Auto-Submit: Rob Clark <robdclark@chromium.org>
Binu R S [Mon, 20 Jul 2020 05:06:53 +0000 (10:36 +0530)]
i915: Enable Render Buffer Compression for Gen-11
Enable Render Buffer Compression only for Gen 11
BUG=b:
161520827
TEST=Boot target board to UI
Signed-off-by: Binu R S <binu.r.s@intel.com>
Change-Id: I40739732e915a516837a2c7530b4a81679597efe
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2306853
Reviewed-by: Evan Green <evgreen@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Tested-by: Mohanram Meenakshisundaram <mohanram.meenakshisundaram@intel.com>
Commit-Queue: Justin TerAvest <teravest@chromium.org>
Wei Lee [Tue, 21 Jul 2020 03:27:14 +0000 (11:27 +0800)]
minigbm: Enable NV12 for camera usage on MT8173
BUG=b:
141517606
TEST=tast run [DUT] camera.CCAUI* camera.HAL3*
TEST=Run CtsCameraTestCases
Change-Id: I908f4a9896e716f460325abb741ace4ee8547ad7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2317328
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Tested-by: Wei Lee <wtlee@chromium.org>
Kristian H. Kristensen [Thu, 23 Jul 2020 23:04:47 +0000 (16:04 -0700)]
cros_gralloc: Add perform action for getting the modifier
BUG=b:
145579089, b:
79682290
TEST=arc++ apps using non-linear format layouts
Change-Id: I9d71852b52b984d89428a07fad5c82d61150e8a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2316523
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Kristian H. Kristensen <hoegsberg@chromium.org>
Ewan Roycroft [Thu, 23 Jul 2020 15:08:14 +0000 (16:08 +0100)]
minigbm: vc4: Fix error log for DRM_IOCTL_VC4_CREATE_BO
An ioctl call is made to DRM_IOCTL_VC4_CREATE_BO. On error, it
incorrectly reports that DRM_IOCTL_VC4_GEM_CREATE has failed. This fixes
the log message.
Change-Id: I1b817dba1feae370f5fecfd756595c436cc6d6c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2316159
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Ewan Roycroft <ewan.roycroft@bbc.co.uk>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Alistair Delva [Mon, 27 Jul 2020 21:39:53 +0000 (21:39 +0000)]
Add host build of libgbm.so for crosvm am:
9413c105e4
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1368796
Change-Id: Ia6539242a93745b32b8c17c547bafcebac5b4254
Alistair Delva [Tue, 21 Jul 2020 19:04:48 +0000 (12:04 -0700)]
Add host build of libgbm.so for crosvm
Build minigbm for the host.
Bug:
161831173
Change-Id: I30699c38f958ee03a1b3f8495ecc42e9779f8332
Merged-In: I30699c38f958ee03a1b3f8495ecc42e9779f8332
Douglas Anderson [Tue, 21 Jul 2020 15:06:46 +0000 (08:06 -0700)]
minigbm/msm: Don't use uninitialized metadata to setup DRM_FORMAT_R8
CL:
2245540 seems to have accidentally modified msm.c to use an
uninitialized metadata when setting up DRM_FORMAT_R8. Let's go back
to using LINEAR_METADATA.
BUG=b:
161426616
TEST=Camera no longer crashes
Change-Id: Ia587821216c82d4488b096686904f82147224aa5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2310289
Tested-by: Douglas Anderson <dianders@chromium.org>
Auto-Submit: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
Commit-Queue: Douglas Anderson <dianders@chromium.org>
Bas Nieuwenhuizen [Tue, 14 Jul 2020 12:15:38 +0000 (14:15 +0200)]
dri: Complete the 10-bits formats.
They were added to the AMDGPU driver but only half of the formats
were in the mapping table.
Fixes:
b16076b "amdgpu: Add 10-bit color formats."
BUG=b:
161136516
TEST=run graphics_Gbm on Grunt
Change-Id: I445da2df7b049e3c18456b978a79b28d5b7d008a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2297423
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Jason Macnak [Mon, 13 Jul 2020 16:14:45 +0000 (16:14 +0000)]
[automerger skipped] cros_gralloc: makes flex format use RGBX am:
cbd768f2b3 am:
9f909ad34e -s ours
am skip reason: Change-Id I27f020b4f661890bcc2817deb09ffb9af1c76f1b with SHA-1
1476c7ea85 is in history
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1359582
Change-Id: Id6c11d1f63223260f5e71ea00b6499164c019abd
Jason Macnak [Mon, 13 Jul 2020 16:02:58 +0000 (16:02 +0000)]
cros_gralloc: makes flex format use RGBX am:
cbd768f2b3
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1359582
Change-Id: Ie13c165594322fea07b6c946a5b569a14ea81208
Daniel Nicoara [Thu, 9 Jul 2020 23:15:42 +0000 (19:15 -0400)]
meson: Add support for YUV formats
Add support to allocate a number of YUV formats. Particularly around
NV12 which can be used in the camera and encoder. This will allow
allocating/sharing buffers across multiple devices via dmabuf.
BUG=b/
159467426
TEST=Allocate NV12 buffer and composite it on the GPU.
Change-Id: I9b5dc54dae7f578f7e099a64bd67589658693534
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2291194
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Daniel Nicoara <dnicoara@chromium.org>
Tested-by: Daniel Nicoara <dnicoara@chromium.org>
Jason Macnak [Thu, 9 Jul 2020 20:39:18 +0000 (13:39 -0700)]
cros_gralloc: makes flex format use RGBX
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
Bas Nieuwenhuizen [Mon, 29 Jun 2020 10:41:18 +0000 (12:41 +0200)]
amdgpu: Add 10-bit color formats.
Should be fine for rendering and texturing.
AMDGPU only exposes this on the primary plane though, not on the
overlay or cursor. I strongly suspect the HW could also do this
on the overlay but I lack a proper testcase for now.
BUG=b:
159011420
TEST=Run tast.video.Play.vp9_2_sw on Zork
Change-Id: Ie3a5356576a960985aac0ba16665425f45bd1541
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2272566
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Jason Macnak [Wed, 8 Jul 2020 21:51:13 +0000 (14:51 -0700)]
cros_gralloc: fix log statement format specifier
BUG=b:
157902551
TEST=build 64-bit Cuttlefish
Change-Id: Ica6942dca23d562f4527233dd614b8f1ab10b00c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2288583
Tested-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Jason Macnak <natsu@google.com>
Jason Macnak [Wed, 8 Jul 2020 18:46:13 +0000 (11:46 -0700)]
cros_gralloc: set install path in Android.bp
BUG=b:
157902551
TEST=run Cuttlefish w/ Minigbm Gralloc0
Change-Id: I284e911371d0672b1c6663ad601455dd326b8632
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2288141
Tested-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Jason Macnak <natsu@google.com>
Jason Macnak [Wed, 8 Jul 2020 23:26:48 +0000 (23:26 +0000)]
[automerger skipped] cros_gralloc: Fix logging statement format specifier am:
b26e66e866 am:
2530ad5e17 -s ours
am skip reason: Change-Id I27f020b4f661890bcc2817deb09ffb9af1c76f1b with SHA-1
1476c7ea85 is in history
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1358924
Change-Id: Ie812cafe90f864ccbfa3ceb555953c8e28c94465
Jason Macnak [Wed, 8 Jul 2020 23:15:05 +0000 (23:15 +0000)]
cros_gralloc: Fix logging statement format specifier am:
b26e66e866
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1358924
Change-Id: Ifeb5ed4f935d3c3e432290dfec01d5e52aec4ce5
Jason Macnak [Wed, 8 Jul 2020 21:37:28 +0000 (14:37 -0700)]
cros_gralloc: Fix logging statement format specifier
Bug: b/
160813623
Test: lunch aosp_x86_64-eng && m
Change-Id: I8101c2f99925d877d14ef8f4cce372e73288bc22
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Jason Macnak [Wed, 8 Jul 2020 21:38:00 +0000 (21:38 +0000)]
[automerger skipped] cros_gralloc: set install path in Android.bp am:
410021fde7 am:
b63e9ba9e0 -s ours
am skip reason: Change-Id I27f020b4f661890bcc2817deb09ffb9af1c76f1b with SHA-1
1476c7ea85 is in history
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1358644
Change-Id: I0f2532d0329a36de10d66e4ed8c8b44d7873d249
Jason Macnak [Wed, 8 Jul 2020 21:37:58 +0000 (21:37 +0000)]
[automerger skipped] Merge 'aosp/upstream-master' into 'aosp/master' am:
b337d757c9 am:
f034387461 -s ours
am skip reason: Change-Id I27f020b4f661890bcc2817deb09ffb9af1c76f1b with SHA-1
1476c7ea85 is in history
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1358643
Change-Id: I1bf99b0208d389681cf0d88b12dd62003e49507f
Jason Macnak [Wed, 8 Jul 2020 21:20:01 +0000 (21:20 +0000)]
cros_gralloc: set install path in Android.bp am:
410021fde7
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1358644
Change-Id: I55adc2b5857f696c7ac6af0f38c9fa09215866d1
Jason Macnak [Wed, 8 Jul 2020 21:19:59 +0000 (21:19 +0000)]
Merge 'aosp/upstream-master' into 'aosp/master' am:
b337d757c9
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/
1358643
Change-Id: I8cd59f945e4ce5553510fc0bb14bf5d857ca06b9
Jason Macnak [Wed, 8 Jul 2020 19:05:51 +0000 (12:05 -0700)]
cros_gralloc: set install path in Android.bp
Upstream change in crrev.com/c/
2288141
Bug: b/
157902551
Test: run Cuttlefish w/ Minigbm Gralloc0
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: I92bf42f1f7ff82c0c6697f131b01557a5fc94767
Jason Macnak [Wed, 8 Jul 2020 19:03:20 +0000 (12:03 -0700)]
Merge 'aosp/upstream-master' into 'aosp/master'
... to update Minigbm for Cuttlefish to support Gralloc3
on Minigbm.
Bug: b/
157902551
Test: m && launch_cvd --gpu_mode=gfxstream
Test: m && launch_cvd --gpu_mode=drm_virgl
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: Ic96add709a99005ff7aa6c7d886e3069b827e4bc
Jason Macnak [Fri, 24 Jan 2020 23:05:57 +0000 (15:05 -0800)]
cros_gralloc: Adds gralloc 3.0 support
Implements the allocator 3.0 and mapper 3.0 interfaces
which:
- Implements HIDL interface directly (older versions
are wrapped in a passthrough HIDL interface)
- Adds isSupported() to allow checking for format and
usage combination support before allocating.
Adds emulated multi-planar buffer support to virtio
backend for non gbm enabled hosts.
Updates cros_gralloc_handle to use uint64_t instead of
two uint32_t for some members.
Updates cros_gralloc_handle to have a single format
modifier.
Replaces Android makefiles with Android bp files.
BUG=b:
146515640
TEST=run Cuttlefish w/ gralloc3 and run CTS tests
Change-Id: I43ed9788a2413201bddce17ffb69b76006ef39fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2273554
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Ikshwaku Chauhan [Mon, 29 Jun 2020 11:14:57 +0000 (16:44 +0530)]
minigbm:amdgpu: align height to 16 bit for video buffers
Currently, allocator used by chrome aligns the height of Encoder/Decoder
buffer while allocator used by android(gralloc/minigbm) doesn't provide
any aligment.Aligned the height for video buffers in minigbm.
BUG=b:
153130069
TEST=cheets_CTS_P.x86.CtsVideoTestCases
Signed-off-by: Ikshwaku Chauhan <ikshwaku.chauhan@amd.corp-partner.google.com>
Change-Id: I62a883ca55c07674fab7981af0974277fbd2c5b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2273037
Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Tested-by: Drew Davenport <ddavenport@chromium.org>
Commit-Queue: Drew Davenport <ddavenport@chromium.org>
Bas Nieuwenhuizen [Thu, 4 Jun 2020 21:11:27 +0000 (23:11 +0200)]
Revert "Revert "amdgpu: Set USWC for SCANOUT images.""
This reverts commit
91d36976aa84abde87f0f56d235d57042ca3ea81.i
The previous changes should fix the mapping performance with USWC
memory.
original change:
amdgpu: Set USWC for SCANOUT images.
This is necessary for scanout from GTT. Without it, the kernel will
migrate it to the carveout. For large resolutions this would not be
feasible due to small carveout sizes and hence it is important that
we alloc scanout from GTT.
The original patch was on top of
4eebcea "amdgpu: make AMDGPU_GEM_CREATE_CPU_GTT_USWC flag default"
which set USWC unconditionally, but has since been reverted. The
main failure reason is being addressed in mesa-amd. This patch also
still disables USWC if we can and the image will be read often on
the CPU, to avoid staging textures during memory mapping.
TEST=Run android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing on Grunt.
BUG=b:
152378755
Change-Id: Ice0041de6676c057a2659986b962c2d54833e928
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2246025
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Bas Nieuwenhuizen [Sat, 20 Jun 2020 01:50:34 +0000 (03:50 +0200)]
amdgpu: Add SDMA copy support.
For SCANOUT images we need to use USWC memory. However USWC
memory is very slow to read from (~25 MiB/second).
At the same time for video decoding there are some images
that are allocated with SCANOUT but at the same time frequently
accessed from the CPU. Just mapping these is going to result
in non-satisfactory performance, so this patch adds a DMA step
to copy it to memory that is faster to acces from the CPU.
Benchmarked on Grunt with
android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing
The time that an image (~500 KiB) is kept mapped for processing,
including the time for mapping and unmapping:
plain GTT (cachaeable): 1.5-2 ms
USWC: 45-50 ms
USWC w/ memcpy: 20-30 ms
USWC w/ SDMA copy: 3.5-5.5 ms
We can clearly see that the Android video processing code only gets
a throughput of ~10 MiB/s with USWC memory. memcpy is slightly more
efficient by getting 20-30 MiB/s, but neither of these are suitable
for 30+ fps video.
Furthermore, with SDMA copy, the timing is roughly as follows:
map:
- Allocate plain GTT BO: ~400-800 us
- map src & dst BO into GPU VM: ~25 us
- submit SDMA copy: ~80 us
- wait till SDMA copy finishes: ~400 us
- unmap src & dst BO from GPU: ~15 us
- map dst BO into CPU: ~30 us
unmap:
- unmapping dst BO from CPU: ~30 us
- Copy not benchmarked (avoided for RO map)
- delete BO: ~100 us
ideas for further improvement:
- BO cache
- rely on implicit sync and don't wait for the copy during
unmapping.
Alternatives that have been rejected:
- Use radeonsi + DRI interface: each plane gets mapped into
its own BO, which is an issue for gralloc.
- more persistently mapping each BO into GPU VM: this needs
proper address space management which adds complexity.
librm_amdgpu can do it for us but brings its own can of worms
with dedup of the drm fd. (which makes e.g. implicit sync not
work with any radeonsi instances in the same process)
- Use SDMA instead of DRI/Radeonsi for more images. This is an
issue because SDMA for images is a whole mess with lots of
corner cases and lots of changes per generation. Furthermore,
it wouldn't work for DCC compressed images.
TEST=Run android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing on Grunt.
BUG=b:
152378755
Change-Id: I8f5e00ff4b6d9e31f78fd4de7eb62d0d3aa66438
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2256228
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Hirokazu Honda [Tue, 23 Jun 2020 08:52:20 +0000 (17:52 +0900)]
Modify NV12 allowed buffer usages for camera capture use case
We use SCANOUT_VEA_READ_CAMERA_AND_CPU_READ_WRITE for camera
capture use scenario in Chrome. Therefore, NV12 format must be
allowed for all those usage masks. This CL modifies the usages on
all platforms.
BUG=chromium:982201
TEST=video.EncodeAccel.vp8_720p_i420 on eve
Change-Id: I7880e64049f3bbf9dd1c177619e41362baf641f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2240995
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Matthias Springer [Mon, 22 Jun 2020 01:05:22 +0000 (10:05 +0900)]
minigbm: virtio-gpu: Remove offset log message
When running the Zoom Android client, "Non-zero transfer offset" was
printed in the logs. We now know for sure that we encounter this case in
the wild, thus removing the log message.
BUG=none
TEST=build minigbm manually
Change-Id: I1a536df50996e5218548fb097543566affa9af3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2255931
Tested-by: Matthias Springer <springerm@chromium.org>
Auto-Submit: Matthias Springer <springerm@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Matthias Springer <springerm@chromium.org>
Hirokazu Honda [Tue, 16 Jun 2020 06:28:56 +0000 (15:28 +0900)]
Remove HW_VIDEO_ENCODER usage of YVU420
minigbm has allowed HW_VIDEO_ENCODER usage to YVU420 so that
chrome can allocate YVU420 with HW_VIDEO_ENCODER. But this
format is no longer allocated by chrome with the usage. Let's
delete the code.
BUG=chromium:982201
TEST=None
Change-Id: Ia6bbc24e7782e3e73c2eb00c00127af212ddf486
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2245967
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Auto-Submit: Hirokazu Honda <hiroh@chromium.org>
David Stevens [Mon, 15 Jun 2020 04:48:48 +0000 (13:48 +0900)]
minigbm: add encoder/decoder blob combination
ARCVM sets encoder/decoder usage on the blob output/input buffers, so
that virtio_gpu knows to perform transfers from/to the host where
appropriate. Recently, virtio_gpu started passing all bind flags to the
host, instead of reducing them in the guest. These factors combined
means that the host backends now need to support encoder/decoder usage
with R8 format.
Test: manually verify ARCVM YouTube
Bug: b:
158957350
Change-Id: I58bf657496647f8002c693d17a1186f4cf527b01
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2245540
Tested-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
Jason Macnak [Thu, 11 Jun 2020 22:20:45 +0000 (22:20 +0000)]
gralloc: Use YVU420_ANDROID for YCbCr flex am:
06d77b4e7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minigbm/+/
11817987
Change-Id: I5cba8e31b5ff2636bcf7b0579531d787b585f1b8
Jason Macnak [Thu, 11 Jun 2020 05:39:06 +0000 (22:39 -0700)]
gralloc: Use YVU420_ANDROID for YCbCr flex
... to fix camera preview.
Bug: b/
146515640
Bug: b/
158703419
Test: manually open default camera app
Test: manually open TestingCamera app
Change-Id: Ice550649c5fa125cc09394bd17ad8a5f9c4ed2fa
David Staessens [Thu, 28 May 2020 06:47:15 +0000 (15:47 +0900)]
minigbm: virtio_gpu: add BO_USE_HW_VIDEO_ENCODER usage to R8 format.
This combination will be used by ARCVM for video encoder bitstream
blobs. Minigbm uses the usage flags to determine whether it needs to
transfer data to/from the host, and whether that transfer needs to be
synchronous. BO_USE_HW_VIDEO_ENCODER needs to be set on the encoder's
output buffers so that minigbm knows that the host modifies the buffer,
so that minigbm transfers the data to the guest.
BUG=b:
143570994
TEST=emerge-$BOARD minigbm arc-cros-gralloc
Change-Id: I05eb35d7b68092138c337c0e7fc43f60dd1bc32d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2217833
Tested-by: David Staessens <dstaessens@chromium.org>
Commit-Queue: David Staessens <dstaessens@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
David Stevens [Fri, 15 May 2020 05:15:35 +0000 (14:15 +0900)]
minigbm: virtio_gpu: use expanded bind flags
Pass more bind flags from minigbm to virglrenderer. This is necessary to
handle cases where special alignment/padding is required for certain
use cases. For example, jpeg camera recording on mediatek requires extra
padding. Minigbm adds this due to BO_USE_HW_VIDEO_ENCODER, so that flag
must be properly passed from virtio_gpu to host minigbm.
BUG: b:
151197279
TEST: verify that ArcCameraFpsTest recording works on kukui
Change-Id: Ie2871b37ca468930abe41738ed0ee4fad0f4cf1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2203164
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
Tested-by: David Stevens <stevensd@chromium.org>
Douglas Anderson [Tue, 19 May 2020 17:12:14 +0000 (10:12 -0700)]
minigbm/msm: Add DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED for msm
It seems to be tradition to copy a bit of code into the
resolve_format() function for everyone. The msm driver isn't one to
break from tradition, so we'll adopt this code fragment too.
BUG=b:
154782445
TEST=Hangout
Change-Id: I9e8eaf0c5a8485afea82437fd7249e24e5509b5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2209178
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Douglas Anderson <dianders@chromium.org>
Tested-by: Douglas Anderson <dianders@chromium.org>
Marissa Wall [Fri, 29 May 2020 19:04:54 +0000 (19:04 +0000)]
gralloc4: adds gralloc4 support am:
1476c7ea85
Change-Id: I4a241480e9f397d4cd9869e72c35ba7a00ae615f
Marissa Wall [Fri, 24 Jan 2020 23:05:57 +0000 (15:05 -0800)]
gralloc4: adds gralloc4 support
Implements the Allocator 4.0 and Mapper 4.0 interfaces.
Some notable features of the 4.0 interface:
- buffer metadata getter/setters
- buffer flushing
- buffer debugging (buffer listing and buffer id)
Exempt-From-Owner-Approval: OWNERS.android is not being parsed
Bug: b/
146515640
Test: m && launch_cvd
Test: m && launch_cvd --gpu_mode=drm_virgl
Change-Id: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Gurchetan Singh [Tue, 5 May 2020 16:18:22 +0000 (09:18 -0700)]
minigbm: virtio_gpu: fill transfer offset
virglrenderer expects info->offset to be non-zero when a subregion
of the buffer is transferred. Interestingly enough, minigbm doesn't
seem to hit that case in my (limited) testing. Fill the transfer
offset and add logging statements. Maybe we could fail on that case
if we don't encounter it in the wild.
BUG=none
TEST=manual testing with betty
Change-Id: I2f3afaff373777fb8808a0bea169be491d864d1a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2182791
Reviewed-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Chia-I Wu <olv@google.com>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Sean Paul [Tue, 19 May 2020 14:17:07 +0000 (10:17 -0400)]
i915: Avoid using y-tiling on huge buffer objects
<= GEN11 i915 devices can't scan out Y-tiled buffers greater than 4096
in width. This patch downgrades these huge buffers to X-tiled which can
be scanned out.
BUG=b:
151166605
BUG=chromium:988091
TEST=Tested with hatch on Samsung CRG9 5k display
Change-Id: I9f83ab1f9d1f2a254ca0ae7028c138f87be378eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2207670
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Robert Tarasov <tutankhamen@chromium.org>
Tested-by: Sean Paul <seanpaul@chromium.org>
Auto-Submit: Sean Paul <seanpaul@chromium.org>
Commit-Queue: Sean Paul <seanpaul@chromium.org>
Jason Macnak [Wed, 20 May 2020 06:34:54 +0000 (06:34 +0000)]
Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev' am:
3d804156b0
Change-Id: Iab41f5c23682063d7c453ccc1f3630f19ad6a4bb
Jason Macnak [Tue, 19 May 2020 16:30:02 +0000 (16:30 +0000)]
Merge 'aosp/upstream-master' into 'aosp/master' am:
01b2926cf7 am:
702c5561af
Change-Id: I8db9f66059bba42a1f15dbeb8327e7184360f03f
Jason Macnak [Tue, 19 May 2020 16:20:10 +0000 (16:20 +0000)]
Merge 'aosp/upstream-master' into 'aosp/master' am:
01b2926cf7
Change-Id: Ib55889bc29919cf571406f1e1563fa0c34c7bbf7
Jason Macnak [Tue, 19 May 2020 16:14:33 +0000 (09:14 -0700)]
Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev'
... to merge in http://crrev.com/c/
2171157 which
is needed for Cuttlefish on Minigbm Gralloc 4.
Also adds OWNERS.android to avoid merge conflicts
with upstream OWNERS file.
Bug: b/
146515640
Test: launch_cvd
Test: launch_cvd --gpu_mode=drm_virgl
Change-Id: Ic3b0812c7c35cc99fc96d3bdd3b8f811fb1507f5
Jason Macnak [Mon, 18 May 2020 19:05:53 +0000 (12:05 -0700)]
Merge 'aosp/upstream-master' into 'aosp/master'
... to merge in http://crrev.com/c/
2171157 which
is needed for Cuttlefish on Minigbm Gralloc 4.
Also adds OWNERS.android to avoid merge conflicts
with upstream OWNERS file.
Bug: b/
146515640
Test: launch_cvd
Test: launch_cvd --gpu_mode=drm_virgl
Change-Id: I6dafb814cc47e3193439cc10af74a0099962813e
Jason Macnak [Thu, 14 May 2020 17:57:17 +0000 (10:57 -0700)]
minigbm: Fix cast to avoid null pointer arithmetic
'external/minigbm/cros_gralloc/gralloc0/gralloc0.cc:417:50:
error: arithmetic on a null pointer treated as a cast from
integer to pointer is a GNU extension'
BUG=b:
146515640
TEST=m gralloc.minigbm
Change-Id: I2e86b676224657bdb656a45db4cfa49e84b61c2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2202518
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Auto-Submit: Jason Macnak <natsu@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Chih-Yu Huang [Thu, 7 May 2020 02:54:24 +0000 (11:54 +0900)]
minigbm: virtio_gpu: add BO_USE_HW_VIDEO_DECODER usage to R8 format.
This combination will be used by ARCVM for video decoder bitstream
blobs.
BUG=b:
156442659
TEST=run e2e test with C2VDAComponent
Change-Id: Iad978f659c0a8edf3279b303794c2b840446be31
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2189994
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
Auto-Submit: Chih-Yu Huang <akahuang@chromium.org>
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Tested-by: Chih-Yu Huang <akahuang@chromium.org>
Jason Macnak [Wed, 6 May 2020 22:14:47 +0000 (22:14 +0000)]
Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev' am:
3c53003fca
Change-Id: I07b7abc10695e968b769ffacabecf1cbdb4bb55f
Jason Macnak [Wed, 6 May 2020 20:38:12 +0000 (13:38 -0700)]
Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev'
... to cherry-pick aosp/
1252358 into rvc-dev for gralloc 4
changes.
Bug: b/
146515640
Test: m && launch_cvd
Change-Id: I09be0f84945557878ffdf56b2579dba2879d1b50
Jason Macnak [Tue, 28 Apr 2020 18:21:16 +0000 (11:21 -0700)]
Fix YV12 dumb buffer plane sizes
Allocating a 1280x720 YUV420 (YV12) buffer results in
calling the create dumb ioctl with 1280x1080 and results
in a file with size
1384448
(1280 * 1080 =
1382400, ALIGN(
1382400, 4096) =
1384448).
The existing code calls drv_bo_from_format with the
aligned height of 768 which results in oversized planes
totaling a size of
1474560 bytes. This ultimately leads
to segfaults when running past the end of the mapped
file.
Because the dumb buffer iotcl height is computed using
the buffer's unaligned height (bo->meta.height), the
call to drv_bo_from_format should use the unaligned
height as well.
BUG=b:
146515640
TEST=cts android.media.cts.EncodeDecodeTest
Change-Id: I40893cf92caa9d35a89d21a3512604f361822222
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2171157
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Bas Nieuwenhuizen [Mon, 27 Apr 2020 19:59:29 +0000 (19:59 +0000)]
Revert "amdgpu: Set USWC for SCANOUT images."
This reverts commit
d2c28439190dbf1ab678a4dae5aa23dada7808bd.
Reason for revert: b/
55018529: broke android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing and fixing it is non-trivial
Original change's description:
> amdgpu: Set USWC for SCANOUT images.
>
> This is necessary for scanout from GTT. Without it, the kernel will
> migrate it to the carveout. For large resolutions this would not be
> feasible due to small carveout sizes and hence it is important that
> we alloc scanout from GTT.
>
> The original patch was on top of
>
4eebcea "amdgpu: make AMDGPU_GEM_CREATE_CPU_GTT_USWC flag default"
> which set USWC unconditionally, but has since been reverted. The
> main failure reason is being addressed in mesa-amd. This patch also
> still disables USWC if we can and the image will be read often on
> the CPU, to avoid staging textures during memory mapping.
>
> BUG=b:
153247881
> TEST=Run CtsCameraTestCases on Grunt.
> 4k YouTube video p/b
>
> Change-Id: If6393e60cea5d2a98a052d7c46604e0012de0618
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2134451
> Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
> Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
> Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Bug: b:
153247881
Change-Id: I395798c637ab10a2cf2a2a65a3a418a18feb2310
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2167399
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Min Zhao [Tue, 14 Apr 2020 22:51:04 +0000 (15:51 -0700)]
minigbm: synaptics: add texture source format support
BUG=b:
152384632
TEST=Test by making DUO video call
Change-Id: I2c7920652ab48699a66aedc11f56f44aea9d1c4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2162517
Tested-by: Daniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Daniel Nicoara <dnicoara@chromium.org>
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Bas Nieuwenhuizen [Mon, 6 Apr 2020 16:50:24 +0000 (18:50 +0200)]
amdgpu: Set USWC for SCANOUT images.
This is necessary for scanout from GTT. Without it, the kernel will
migrate it to the carveout. For large resolutions this would not be
feasible due to small carveout sizes and hence it is important that
we alloc scanout from GTT.
The original patch was on top of
4eebcea "amdgpu: make AMDGPU_GEM_CREATE_CPU_GTT_USWC flag default"
which set USWC unconditionally, but has since been reverted. The
main failure reason is being addressed in mesa-amd. This patch also
still disables USWC if we can and the image will be read often on
the CPU, to avoid staging textures during memory mapping.
BUG=b:
153247881
TEST=Run CtsCameraTestCases on Grunt.
4k YouTube video p/b
Change-Id: If6393e60cea5d2a98a052d7c46604e0012de0618
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2134451
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
Ilja H. Friedel [Fri, 17 Apr 2020 22:50:41 +0000 (15:50 -0700)]
Sort OWNERS and add ihf.
BUG=None.
TEST=None.
Change-Id: Id3efc609c23f71b1170ff6c50ef018693425f044
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2154052
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Mark Yacoub [Fri, 17 Apr 2020 20:27:48 +0000 (16:27 -0400)]
Remove i915_FORMAT_MOD_Y_TILED_CCS from modifier_order
Revert adding i915_FORMAT_MOD_Y_TILED_CCS to the modifiers options.
Reason for revert: Devices with internal 4K displays aren't able to drive external 4K monitors as well.
(This is a partial revert of crrev.com/c/
2044490)
BUG=chromium:979736,b:
153731006
Change-Id: I40a0c686ee348f94e25b399b9ab91d4d6d377bc5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2154983
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Mark Yacoub <markyacoub@google.com>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Mark Yacoub <markyacoub@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Auto-Submit: Mark Yacoub <markyacoub@google.com>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Matthew Blecker <matthewb@chromium.org>
Jao-ke Chin-Lee [Fri, 10 Apr 2020 00:12:12 +0000 (00:12 +0000)]
Revert "amdgpu: make AMDGPU_GEM_CREATE_CPU_GTT_USWC flag default"
This reverts commit
4eebcea0cc53e385f715730e883963e86761a2f9.
Reason for revert: Broke tast.video.DecodeAccel.*.h264_resolution_switch on grunt
Original change's description:
> amdgpu: make AMDGPU_GEM_CREATE_CPU_GTT_USWC flag default
>
> amdgpu kernel driver requires USWC flag for allowing bo
> allocation in GTT domain, hence enable it by default.
>
> BUG=b:
152378755
> TEST=On Dali play 4k YouTube video
>
> Signed-off-by: Shirish S <shirish.s@amd.com>
> Change-Id: Ic509701f683d184d3fb85b7616dc9a7ed467cfe3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2128147
> Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
> Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org>
> Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Bug: b:
152378755
Change-Id: If382833a741faa5462df841cc801e60fd9fca77a
Exempt-From-Owner-Approval: revert.
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2145078
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Jao-ke Chin-Lee <jchinlee@google.com>
Xin Li [Fri, 10 Apr 2020 03:17:13 +0000 (03:17 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am:
f8aa9be293 -s ours
am skip reason: subject contains skip directive
Change-Id: I9c49dae1deb812561ed556e317c8434e306c494a
Xin Li [Fri, 10 Apr 2020 00:50:49 +0000 (17:50 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug:
151763422
Change-Id: Ie120bc3c42cef98e182f13c8ef23a15a1e291710
Shirish S [Tue, 31 Mar 2020 10:35:33 +0000 (16:05 +0530)]
amdgpu: make AMDGPU_GEM_CREATE_CPU_GTT_USWC flag default
amdgpu kernel driver requires USWC flag for allowing bo
allocation in GTT domain, hence enable it by default.
BUG=b:
152378755
TEST=On Dali play 4k YouTube video
Signed-off-by: Shirish S <shirish.s@amd.com>
Change-Id: Ic509701f683d184d3fb85b7616dc9a7ed467cfe3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2128147
Tested-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Gurchetan Singh [Fri, 13 Sep 2019 00:26:45 +0000 (17:26 -0700)]
minigbm: virtgpu: refactor virtgpu features
This way, we can call the GET_PARAM ioctl in a loop.
BUG=chromium:924405
TEST=compile
Change-Id: I74359b758a864d72bdec04b7741bbe9e2b466f1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2133073
Reviewed-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Lepton Wu <lepton@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Lepton Wu <lepton@chromium.org>
Gurchetan Singh [Fri, 28 Jun 2019 03:05:54 +0000 (20:05 -0700)]
minigbm: add resource_info callback for virtio-gpu
In ARC++, the wayland sevice and the video stack rely on
GRALLOC_DRM_GET_STRIDE and (*lock_ycbcr) with zero flags to return
the metadata associated with the buffer.
In the past, we've simply returned the metadata that was calculated
during allocation.
Since the current virtio-gpu API relies on shadow buffers, there's
actually two different sets of metadata:
1) The metadata of the shadow buffer --> useful for mapping
2) The metadata of the host resource --> useful for passing to Chrome
For the wayland_service and video stack, we want to return (2).
For the Android framework, we want to return (1).
BUG=b:
132939420
TEST=compile
Change-Id: I1134d651396ba68e064eaf2e3cad3cb3225d7c5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
1681383
Reviewed-by: David Stevens <stevensd@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Gurchetan Singh [Thu, 6 Feb 2020 02:18:52 +0000 (18:18 -0800)]
drm/virtgpu: add header
It's useless to try to keep up with a evolving UAPI, so just add it
here temporarily.
Change-Id: I18671f64cdf28af829fef1124f9f93cb4ffddcb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2003266
Reviewed-by: David Stevens <stevensd@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Gurchetan Singh [Tue, 24 Mar 2020 20:53:51 +0000 (13:53 -0700)]
minigbm: mediatek: fix SCANOUT flag
All renderer target works are eligible for scanout, after looking
at mtk_plane_init.
BUG=b:
151064316
TEST=Mirror mode works again on Kukui
Change-Id: Ife8948c167c1d75622404af573f8cc92b3516416
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2118463
Reviewed-by: David Stevens <stevensd@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Leona Chou [Thu, 19 Mar 2020 07:06:12 +0000 (15:06 +0800)]
minigbm: add synaptics gbm driver
Change the ozone platform from cast to drm
add synaptics gbm driver for buffer management.
BUG=b:
152384632
TEST=use chromecast ui to verify drm
TEST=use ozone_demo app to verify drm
Change-Id: I9dff03e6b522ee84e34cbbcb28a40ca7857c4168
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2108458
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Daniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Daniel Nicoara <dnicoara@chromium.org>
Bob Badour [Thu, 26 Mar 2020 06:18:54 +0000 (06:18 +0000)]
Remove redundant NOTICE copied from LICENSE. am:
6124269123 am:
3374b31327
Change-Id: Ic34ad220b9351e32222043d72cf398afc4eb06c9
Bob Badour [Thu, 26 Mar 2020 06:18:48 +0000 (06:18 +0000)]
Remove redundant NOTICE copied from LICENSE. am:
6124269123 am:
3374b31327
Change-Id: I0ed1dd49cb0e5146ed623fddc4e6a45893704633
Bob Badour [Thu, 26 Mar 2020 06:08:12 +0000 (06:08 +0000)]
Remove redundant NOTICE copied from LICENSE. am:
6124269123
Change-Id: I51659aff4abeb40ef86658d898b56d5ff8ae2e3f
Bob Badour [Thu, 26 Mar 2020 01:56:41 +0000 (18:56 -0700)]
Remove redundant NOTICE copied from LICENSE.
Identified using the below shell script:
$ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \
| while read dir; do \
if [ -f "${dir}/NOTICE" ] \
&& diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \
echo "${dir}/NOTICE"; \
fi; \
done
Now that http://r.android.com/r/
1235427 and http://r.android.com/r/
1238719 are
merged, LICENSE files copied into NOTICE files are no longer needed.
Bug:
67772237
Bug:
68860345
Test: manually built and diffed before and after system image notices
Change-Id: I09ef28a103ff9f4b186f4a977cfb66ae63ca01e1
Daniel Nicoara [Tue, 24 Mar 2020 23:24:43 +0000 (19:24 -0400)]
Add more scanout formats to meson driver
BUG=None
TEST=Allocated AB24 buffers with scanout bit to validate it works.
Change-Id: I415026034e2dd1598d519f00ef4e075731d28074
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2118939
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Daniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Daniel Nicoara <dnicoara@chromium.org>
Gurchetan Singh [Tue, 24 Mar 2020 20:48:54 +0000 (13:48 -0700)]
minigbm: run presubmit.sh, modify OWNERs
BUG=none
TEST=none
Change-Id: I07ae6fa603117f16dee39b1b7e9ca3162daa0c97
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2118462
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Xin Li [Thu, 19 Mar 2020 04:26:05 +0000 (04:26 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master am:
9aed03a89c -s ours
am skip reason: subject contains skip directive
Change-Id: Iefc55b3bca58285f15de016771885e64652b093a
Xin Li [Thu, 19 Mar 2020 04:20:03 +0000 (04:20 +0000)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master am:
9aed03a89c
Change-Id: I24776053add4a793c3223612d580f71ffb1ed8a8
Xin Li [Thu, 19 Mar 2020 02:40:39 +0000 (19:40 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@
6304901 into stag-aosp-master
Bug:
151763422
Change-Id: I59a7d953d879770eee93ccb8c7c4ba355baa20d9
Jason Macnak [Fri, 13 Mar 2020 16:55:13 +0000 (09:55 -0700)]
minigbm: virtio: check caps version before disabling formats
Gfxstream backend does not yet populate supported formats cap
info.
Bug: b/
146066070
Test: launch_cvd --gpu_mode=gfxstream
Change-Id: I28964c7701c5fd4cbe4ebc77f9fc553c64aeb924
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/
2103048
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Automerger Merge Worker [Mon, 16 Mar 2020 19:56:33 +0000 (19:56 +0000)]
minigbm: virtio: check caps available before disabling formats am:
51990ce154 am:
586e8d4831
Change-Id: I84f231a945f7d8523e7020ced171bb94dd272ae7