summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-08Snap for 8917908 from 08c47c10976736de61e00a2b89e1705837f38dd9 to ↵aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020android13-mainline-ipsec-releaseAndroid Build Coastguard Worker
mainline-ipsec-release Change-Id: I4f71c93637ad1a9d94c5693f5cc2f589306e8c1e
2022-06-27Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/tm-dev' ↵Jason Macnak
am: 722a08bb8a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minigbm/+/19057927 Change-Id: Ifed7a565cd5269051e1949e8bec96d5ea9d1c051 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/tm-dev'Jason Macnak
... 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
2022-06-20Snap for 8746144 from abe9dcaf0bfaa44d84eb87f0bdeb7ef754b86247 to ↵Android Build Coastguard Worker
mainline-ipsec-release Change-Id: I74b9cc2c97dcf48da7d5fc3b440ba54fdd4bd31c
2022-06-16Merge remote-tracking branch 'cros/main' into 'aosp/master'Yiwei Zhang
Bug: 236141032 Test: build and no hang in cts Change-Id: I60316fb5cb2682ca36f0718b2aefa733f293d237
2022-06-14virtgpu_crosdomain: Always use _USE_CROSS_DEVICE (when available)Rob Clark
This is required for dma-buf sharing, which is a thing that can happen for sharing across processes even if it is the same GPU device involved on both ends. (Also, anything that gralloc allocates needs to be dmabuf exportable, so not setting _USE_CROSS_DEVICE is just plain wrong.) This fixes hangs in deqp-cts when using cross-domain virtgpu backend (rather than the virgl backend) BUG=b:230100768 TEST=Run deqp-cts Change-Id: Ic9204feb0af52ef4a25bcfd554425cb8cd3f3fe1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3696038 Tested-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Commit-Queue: Rob Clark <robdclark@chromium.org> Auto-Submit: Rob Clark <robdclark@chromium.org>
2022-06-09minigbm/virgl: Add NV12 to texture formats am: 335711e592 am: c82c24d75d am: ↵Robert Tarasov
ce55ee6b5b am: 7f7db19a83 am: f41e8e1254 am: 9b276576e7 am: 13e4b9ad9f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minigbm/+/18717776 Change-Id: I3039208575af4828af28942d7362e1adfcb781b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09minigbm/virgl: Add NV12 to texture formats am: 335711e592 am: c82c24d75d am: ↵android13-devRobert Tarasov
ce55ee6b5b am: 7f7db19a83 am: f41e8e1254 am: 9b276576e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minigbm/+/18717776 Change-Id: I67262d06cb8340a76aeb74005a44b7c90ffbc971 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: ↵Jason Macnak
c616c5faa0 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2117074 Change-Id: I152119b4723f8b26ec47130614b8e0e6bbccb122 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06minigbm/virgl: Add NV12 to texture formats am: 335711e592 am: c82c24d75d am: ↵Robert Tarasov
ce55ee6b5b am: 7f7db19a83 am: f41e8e1254 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2108602 Bug: 218708219 Change-Id: I83318ea072f88355ff047abc242a5a1af927cf71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> (cherry picked from commit b7ed9e086c91f77d5efcc184ecef71508876a837)
2022-06-06Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'Jason Macnak
... to update Minigbm for Cuttlefish to pull in https://crrev.com/c/3688450 to ensure TRANSFER_FROM_HOST copies happen when `gralloc->lock()` is called on GPU_DATA_BUFFER usage buffers. Bug: b/234513607 Test: launch_cvd --gpu_mode=guest_swiftshader Test: launch_cvd --gpu_mode=gfxstream Change-Id: I98cbc32a2418ffcf8b138084580e8a783bef7024
2022-06-06virtgpu_virgl: invalidate with BO_USE_GPU_DATA_BUFFERJason Macnak
... as the host may write to the buffer in a compute shader. BUG=b:234513607 TEST=cts -m CtsNativeHardwareTestCases -t android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuRead_BLOB Change-Id: Ied49e7861e9ae0cbc9e25ecfb7feec30cc733864 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3688450 Tested-by: Jason Macnak <natsu@google.com> Commit-Queue: Jason Macnak <natsu@google.com> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
2022-06-01minigbm/virgl: Add NV12 to texture formats am: 335711e592Robert Tarasov
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2108602 Change-Id: Ifa89485a1257b38cfd1209bc9e23a0e3651a30b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31minigbm/virgl: Add NV12 to texture formatsRobert Tarasov
Add NV12 to the list of supported texture source formats for virgl. Bug: 218708219 Test: run cts -m CtsNativeHardwareTestCases Change-Id: I771551287400bc974530b273372c01e2645f8f52
2022-05-20ANDROID: minigbm: eliminate fake capset check am: 2fe64ebda9Gurchetan Singh
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2101455 Change-Id: I313cef45e536ac10ac499ad5a6f048811520c7d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19ANDROID: minigbm: eliminate fake capset checkGurchetan Singh
It's better just to conditionally advertise cross domain capset in crosvm. BUG=173630595 TEST=compile Change-Id: Ic44176141cade44bfa0cc2fcf457ddafb7ae7195
2022-05-19amdgpu: Only align video BOs to 512 for AndroidMiguel Casas
crrev/c/3633249 compares libva and minigbm allocated Surfaces/BOs for accelerated video decoding. Currently it fails on e.g. zork because libva (mesa-amd backend) aligns those buffers to 256, whereas minigbm aligns them to 512. This CL reduces the 512-align provision in amdgpu to Android-originated buffers, where IIUC from the bug there is such restriction. BUG=b:200680176 BUG=b:171013552 TEST=vaapi_unittest on zork w/ crrev/c/3633249 Change-Id: I703037c70dded8596408c475518a29de3b59f039 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3647157 Tested-by: Miguel Casas-Sanchez <mcasas@chromium.org> Reviewed-by: Drew Davenport <ddavenport@chromium.org> Commit-Queue: Miguel Casas-Sanchez <mcasas@chromium.org>
2022-05-11Snap for 8570526 from 304bd7820e7a44713e6358a48f9befa75b5b5d41 to ↵Android Build Coastguard Worker
mainline-ipsec-release Change-Id: I0d06d5adcaf88a32b323e8ed9815b475d4da1c05
2022-05-07minigbm: rockchip: Support upstream AFBC modifierBrian Norris
BUG=b:214459790 TEST=boot to ui TEST=null_platform_test, with modifications for choosing CRTC (big VOP) and AFBC modifier; e.g.,: `null_platform_test \ --crtc_index 1 \ --modifier \ 'DRM_FORMAT_MOD_ARM_AFBC(AFBC_FORMAT_MOD_BLOCK_SIZE_16x16|AFBC_FORMAT_MOD_SPARSE|AFBC_FORMAT_MOD_YTR)'` Change-Id: I771d223ada1d7e6254855d28d998c01e455e72ef Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3462927 Reviewed-by: Dominik Behr <dbehr@chromium.org> Tested-by: Brian Norris <briannorris@chromium.org> Commit-Queue: Brian Norris <briannorris@chromium.org>
2022-05-04minigbm: amdgpu: Update plane count in bo_importRobert Mader
This is required for importing multi-plane modifiers where the format plane count is lower (usually `1`). It will be used by Exo for v3/4 of the `zwp_linux_dmabuf_v1` Wayland potocol, allowing Wayland clients (and thus all clients that build on the Wayland support) to use explicit modifiers which again can increase performance on many GPUs. Also add another fallback path to `dri_num_planes_from_modifier()` for cases when `queryDmaBufFormatModifierAttribs()` fails and do some refactoring there. Without this, some test apparently fail. This includes the amdgpu part of commit 1a733377e91b9e714541ea1f51e1f5808b32897c, partially reverting commit 853b8542fbf5711cca4b00d0e30cd3e559c925fd. Bug:b:224580219 Change-Id: I93b64123420b39f3b83ff1bbbb9c59ddf4bc6105 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3568489 Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org> Tested-by: Robert Mader <robert.mader@collabora.com> Commit-Queue: Robert Mader <robert.mader@collabora.com>
2022-04-25Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: ↵Jason Macnak
d369c89c85 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2072342 Change-Id: Ifbd4024035c524d3799ec4175122e1a91ebfb9e3 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'Jason Macnak
... to update Minigbm for Cuttlefish 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: Ifc0f1a51a2e6529f3b55111858fd750f37217ae2
2022-04-20minigbm: remove stevensd from OWNERSDavid Stevens
BUG=None TEST=None Change-Id: I4396f90f9e7de7c5d91ad2777e9061735787caa3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3593418 Tested-by: David Stevens <stevensd@chromium.org> Auto-Submit: David Stevens <stevensd@chromium.org> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
2022-04-20minigbm: i915: Update plane count in bo_importRobert Mader
and implement num_planes_from_modifier interface. This only includes the i915 parts of commit 1a733377e91b9e714541ea1f51e1f5808b32897c, partially reverting commit 853b8542fbf5711cca4b00d0e30cd3e559c925fd. Bug:b:224580219 Change-Id: I94b5181f3ec231929873bc56c1044ca427f9de5b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3568488 Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Reviewed-by: Robert Mader <robert.mader@collabora.corp-partner.google.com> Tested-by: Robert Mader <robert.mader@collabora.corp-partner.google.com> Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
2022-04-19virtgpu_virgl: enable P010 for 3D modeJason Macnak
BUG=b:191084459 TEST=cvd start --gpu_mode=gfxstream TEST=Camera2Video sample app TEST=cts -m CtsCameraTestCases Change-Id: I7b2c902298fed7d1ccab7c31eac8376b0077b718 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3579857 Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Tested-by: Jason Macnak <natsu@google.com> Commit-Queue: Jason Macnak <natsu@google.com>
2022-04-14minigbm/msm: disable UBWC for virtualizationYiwei Zhang
This actually reverts commit 407eb0ebf3ce52fd4b3d79712d1b86d7b021c29b. However, the rationales have been updated. BUG=b:229147702 TEST=emerge and deploy and verified graphics working in crostini Change-Id: I8f491daf14f97a5dbda797207886695a985e44e7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3586372 Tested-by: Yiwei Zhang <zzyiwei@chromium.org> Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org> Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org> Reviewed-by: Chia-I Wu <olv@google.com> Commit-Queue: Chia-I Wu <olv@google.com>
2022-04-13virtgpu_virgl: update virgl_hw.h from upstreamJason Macnak
... to pull in VIRGL_FORMAT_P010 for use with Gfxstream. BUG=b:191084459 TEST=build Change-Id: I7cf9d4ea54f5606e5582d1329dfb1467084a89d3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3579856 Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Tested-by: Jason Macnak <natsu@google.com> Commit-Queue: Jason Macnak <natsu@google.com>
2022-04-12i915: Add ADL-N Device IDsSudarshan S
BUG=b:220084884 TEST=emerge-nissa minigbm On DUT, check UI,video playback and camera previews Ref: https://cgit.freedesktop.org/drm/drm-tip/commit/?id=7e28d0b26759846485978ada860ef4a427e06c8f Change-Id: Ifaa7d3c8336872af07fcfe15cf0f50f83ef24f69 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3473669 Reviewed-by: Victor Ding <victording@chromium.org> Tested-by: Altaf Basha <altaf.basha@intel.corp-partner.google.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> Commit-Queue: Victor Ding <victording@chromium.org>
2022-04-09dumb_driver: Support R8 camera buffersNicholas Bishop
This format is used for JPEG camera data. BUG=b:228365501 TEST=emerge-reven minigbm && cros deploy dut minigbm TEST=Camera preview works on Macbook 7,1 Change-Id: Ida4b1896b68ef7db0bef76e7d6dd2e49b17b2e14 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3577364 Commit-Queue: Nicholas Bishop <nicholasbishop@google.com> Tested-by: Nicholas Bishop <nicholasbishop@google.com> Auto-Submit: Nicholas Bishop <nicholasbishop@google.com> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
2022-04-08minigbm: mediatek: check BO_USE_CAMERA_WRITE flag on camera preview caseHsin-Yi Wang
We only want camera preview use case to use the same padding as BO_USE_HW_VIDEO_ENCODER. Previously we check this by BO_USE_SCANOUT flag. This would cause some format issues in CTS drm tests. This patch updates CL:3551188 to check for BO_USE_CAMERA_WRITE flag as well. BUG=b:227983122 TEST=check camera is normal on kukui TEST=android.media.cts.MediaDrmClearkeyTest#* pass on kukui Change-Id: I1606b677678dfafc6331713f67d327a2b6030394 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3574581 Tested-by: Hsin-Yi Wang <hsinyi@chromium.org> Reviewed-by: Miguel Casas-Sanchez <mcasas@chromium.org> Reviewed-by: Miguel Casas <mcasas@google.com> Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org> Tested-by: Kazuhiro Inaba <kinaba@chromium.org> Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>
2022-04-07minigbm: Add HAS_DMABUF_SYSTEM_HEAP to the msm build target am: 82475270f4 ↵John Stultz
am: c1b1b225fe am: cabdbd33b1 am: b6e7190d75 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2056617 Change-Id: Ic051506733fd9e828393169536d3b39709d6004b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07minigbm: Add HAS_DMABUF_SYSTEM_HEAP to the msm build target am: 82475270f4 ↵John Stultz
am: c1b1b225fe am: cabdbd33b1 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2056617 Change-Id: I777771b49d00bf251d7ae327d0cad9c1522e9522 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07minigbm: Add HAS_DMABUF_SYSTEM_HEAP to the msm build target am: 82475270f4 ↵John Stultz
am: c1b1b225fe Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2056617 Change-Id: I992592cfb11ada3d09fd2ef4ba8bec973ddb7f08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06minigbm: Add HAS_DMABUF_SYSTEM_HEAP to the msm build target am: 82475270f4John Stultz
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2056617 Change-Id: Ia01bc5ac1bbd5690a8c7715ce65c7539c25b06bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06minigbm: Add HAS_DMABUF_SYSTEM_HEAP to the msm build targetJohn Stultz
After commit db3c6fcf0228 ("gralloc: Hide dmabuf heap allocator behind of a flag") landed, db845c started seeing boot failures and the following sepolicy denials in the logcat: allocator@4.0-s: type=1400 audit(0.0:446): avc: denied { read write } for path=2F6D656D66643A7072696D6553686164657243616368655F64737420726573657276656420726567696F6E202864656C6574656429 dev="tmpfs" ino=1378 scontext=u:r:surfaceflinger:s0 tcontext=u:object_r:hal_graphics_allocator_default_tmpfs:s0 tclass=file permissive=0 It seems disabling the the libdmabufheap allocator and falling back to memfd is causing sepolicy troulbe which blocks allocations from working. This patch adds -DHAS_DMABUF_SYSTEM_HEAP to the libminigbm_gralloc_msm target, which resolves the issue. However its not clear if this is the best solution, as I suspect other devices (_meson, etc) may also need this fix. Fixes: db3c6fcf0228 ("gralloc: Hide dmabuf heap allocator behind of a flag") Signed-off-by: John Stultz <jstultz@google.com> Change-Id: Id93c431ac3a449fc7057bec8dff82356b0668153
2022-04-05Revert "minigbm: i915/amdgpu: Update plane count in bo_import"Kazuhiro Inaba
This reverts commit 1a733377e91b9e714541ea1f51e1f5808b32897c. Reason for revert: Broke many ARC tests b/227807607 b/227830888 Original change's description: > minigbm: i915/amdgpu: Update plane count in bo_import > > For format/modifier combination where the plane count does not > match the `DRM_FORMAT_MOD_INVALID` case, importing BOs > (via e.g. `gbm_bo_import`) currently fails as `bo->meta.num_planes` > is not set correctly. > > Fix that by making the driver backends that support such > format/modifier combinations update the plane count accordingly. > > > minigbm: i915: Implement num_planes_from_modifier interface > > Some format/modifier combinations have different plane counts > compared to the formats default (i.e. when the modifier is > `DRM_FORMAT_MOD_INVALID`). > > Right now the supported cases are hardcoded in > `i915_bo_compute_metadata()`, however this does not cover all > use-cases. So implement the already existing backend interface, > aligning i915 with e.g. amdgpu. > > Bug:b:224580219 > Change-Id: If017997c70ab7da04ebf9d6cb9db775d9271ed05 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3516490 > Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org> > Tested-by: Bas Nieuwenhuizen <basni@chromium.org> > Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org> Bug: b:224580219 Change-Id: I334f8cedb1d0414ecd0a38217afa4afc0df6ab47 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3568890 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Tested-by: Kazuhiro Inaba <kinaba@chromium.org> Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org> Reviewed-by: Tadashi G. Takaoka <takaoka@google.com> Commit-Queue: Tadashi G. Takaoka <takaoka@google.com> Owners-Override: Tadashi G. Takaoka <takaoka@google.com>
2022-04-02minigbm: mediatek: remove USE_SCANOUT in yuv formatHsin-Yi Wang
minigbm clients use the SCANOUT flag whenever they want the minigbm-allocated buffers to be promoted to overlays. Mediatek doesn't support YUV overlays, so remove the SCANOUT flag. BUG=b:224698291 TEST=emerge on elm, emerge and deploy on kukui/jacuzzi Change-Id: If3ee2fb925c7e729269c31caab991bb0bc56b0de Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3555233 Tested-by: Hsin-Yi Wang <hsinyi@chromium.org> Feels: Hsin-Yi Wang <hsinyi@chromium.org> Auto-Submit: Hsin-Yi Wang <hsinyi@chromium.org> Reviewed-by: Miguel Casas <mcasas@google.com> Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>
2022-04-01Merge branch 'aosp/upstream-main' into 'aosp/main' am: dffef56827 am: ↵Jason Macnak
67f75e1c74 am: 720b1f1cae am: d358e6b84a Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2052055 Change-Id: Ibaa0c7e8cdfa767006af34ea9678eed77f6632fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge branch 'aosp/upstream-main' into 'aosp/main' am: dffef56827 am: ↵Jason Macnak
67f75e1c74 am: 720b1f1cae Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2052055 Change-Id: Ia0a6ca586fbdf3693041d3217909788ead909df2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge branch 'aosp/upstream-main' into 'aosp/main' am: dffef56827 am: 67f75e1c74Jason Macnak
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2052055 Change-Id: I5303ac8d0fcae93c3edc2350dcd9c6416eb4b4da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge branch 'aosp/upstream-main' into 'aosp/main' am: dffef56827Jason Macnak
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2052055 Change-Id: Id694da4a62ff1020ed766aa95c919be58ea3b619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01gralloc: Enable dmabuf system heap for Cuttlefish am: 9f0521cb06 am: ↵Jason Macnak
402f13f087 am: 044dc5e0ae am: f409c2edd0 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2051732 Change-Id: I0e9de5a335409c8468ee991c6dd12f2e5cbee206 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01gralloc: Enable dmabuf system heap for Cuttlefish am: 9f0521cb06 am: ↵Jason Macnak
402f13f087 am: 044dc5e0ae Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2051732 Change-Id: I1a7c22a0fb578326f6ad35db8b58cd308fd2af1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01gralloc: Enable dmabuf system heap for Cuttlefish am: 9f0521cb06 am: 402f13f087Jason Macnak
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2051732 Change-Id: I12a6b7000ec2745e62e1071bc7467385dada09d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01gralloc: Enable dmabuf system heap for Cuttlefish am: 9f0521cb06Jason Macnak
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2051732 Change-Id: If281920f8ab7aa5798baa7d76309e13628216c97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge branch 'aosp/upstream-main' into 'aosp/main'Jason Macnak
... to pull in https://crrev.com/c/3563512 to avoid trying to use dmabuf heap allocator when dmabuf system heap is not available. Bug: b/227375257 Test: cvd start Test: vts -m VtsHalGraphicsMapperV4_0Target Change-Id: I2de7d0b8e6a898fa34333ade9204929342268659
2022-04-01gralloc: Hide dmabuf heap allocator behind of a flagJason Macnak
... so that devices that have API level 31 but do not have the system dmabuf heap installed (as it is not required) do not spam error logs before falling back to memfd. BUG=b:227375257 TEST=build Cuttlefish with aosp/2051732 TEST=cvd start TEST=vts -m VtsHalGraphicsMapperV4_0Target Change-Id: I7ab79ce472b1e3d84ffa8bb06044ecc933847656 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3563512 Commit-Queue: Jason Macnak <natsu@google.com> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org> Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
2022-03-31gralloc: Enable dmabuf system heap for CuttlefishJason Macnak
... to be used with https://crrev.com/c/3563512. Bug: b/227375257 Test: cvd start Test: vts -m VtsHalGraphicsMapperV4_0Target Change-Id: Iae4e8e2447a4f76ed4d261f7d8bf7287dec7a4d9
2022-03-31minigbm: i915/amdgpu: Update plane count in bo_importRobert Mader
For format/modifier combination where the plane count does not match the `DRM_FORMAT_MOD_INVALID` case, importing BOs (via e.g. `gbm_bo_import`) currently fails as `bo->meta.num_planes` is not set correctly. Fix that by making the driver backends that support such format/modifier combinations update the plane count accordingly. minigbm: i915: Implement num_planes_from_modifier interface Some format/modifier combinations have different plane counts compared to the formats default (i.e. when the modifier is `DRM_FORMAT_MOD_INVALID`). Right now the supported cases are hardcoded in `i915_bo_compute_metadata()`, however this does not cover all use-cases. So implement the already existing backend interface, aligning i915 with e.g. amdgpu. Bug:b:224580219 Change-Id: If017997c70ab7da04ebf9d6cb9db775d9271ed05 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3516490 Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org> Tested-by: Bas Nieuwenhuizen <basni@chromium.org> Commit-Queue: Bas Nieuwenhuizen <basni@chromium.org>
2022-03-31minigbm: mediatek: use the HW_VIDEO_ENCODE padding for camera previewHsin-Yi Wang
Since CL:3515652, preview under photo mode no longer uses hw video encoder. This results in the wrong padding set in minigbm. Make camera preview mode to use the original padding by detecting the GRALLOC_USAGE_HW_COMPOSER (BO_USE_SCANOUT) flag. BUG=b:224698291 TEST=check camera preview on krane Change-Id: I299886a8f2106678f19ffff308331afec9627614 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3551188 Tested-by: Hsin-Yi Wang <hsinyi@chromium.org> Auto-Submit: Hsin-Yi Wang <hsinyi@chromium.org> Reviewed-by: Miguel Casas-Sanchez <mcasas@chromium.org> Reviewed-by: Miguel Casas <mcasas@google.com> Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 01:07:28 +0000