Bring in from upstream:
* d30ea066 (crrev/c/6394316) intel_defines: Add ADL-N PCI ids
Get these earlier missed changes from upstream:
* 3dd534cc Add padding for i915 cursor buffers
* aec65367 virtgpu_cross_domain: Hold a lock for all of bo_create
Bug: 403278247
Test: CI
Change-Id: I0abfa7707032a4601dc456628b20a30ea498e8ea
To ease the desktop development, it's better to expand the existing
owners of minigbm. Unlike CrOS side, I'd like to keep the list minimal
so only introduce per-file for the hw backends under our control.
Bug: N/A
Test: build
Change-Id: I1f05842af9e35c669c28b9e45c443ff30c87d56e
This change adds behavior to pad the requested buffer size when the
BO_USE_CURSOR flag is set. This change is required due to restrictions
on cursor planes with the i915 driver, where a buffer must be of a
particular size in order to be committed to a cursor plane. The exact
requirements can be queried from the DRM_CAP_CURSOR_{WIDTH|HEIGHT}
properties, which if provided, will specify a known acceptable cursor
buffer size. After this change, if the BO_USE_CURSOR flag is set and the
requested size is less than indicated capability, the resulting buffer
will be padded according to the difference.
Bug: b/378461707 , b/388014686
Change-Id: I451421cc784d1e3fdc83eb4e9762d6f0f4caea7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6282179
Tested-by: Andrew Wolfers <aswolfers@chromium.org>
Reviewed-by: Lina Versace <linyaa@google.com>
Commit-Queue: Andrew Wolfers <aswolfers@chromium.org>
from the current libgbm build rule, so that one minigbm build rule
would work for all platforms based on the minigbm platform
soong config varible which is set in the device repository.
Test: boot to homescreen with both msm and generic minigbm
allocator and mapper versions
Change-Id: I939730626eb478f699b1b099054446f25bb7289c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Suggested-by: Jason Macnak <natsu@google.com>
In crosvm, the MinigbmDevice implementation of the Gralloc interface
assumes that a call to get_image_memory_requirements will be immediately
followed by a matching call to allocate_memory, as the implementation
stashes a buffer allocated by the first call to be returned by the
second.
However on Android multiple processes/threads can be making calls to
allocate memory via CrosGralloc. In particular if the device is
configured to use the cross-domain back-end, and two threads are trying
to allocate memory, the two requests to get the memory requirements for
an allocation can be submitted to crosvm followed by the two requests to
actually allocate memory.
When the assumption is violated, the crosvm code was raising an error
for the SECOND memory requirement request. However the error does not
propagate back to the virtgpu_cross_domain code here. The result is that
the request is understood to have succeeded, and the code here then
reads the size metadata from the response buffer, but that contains the
values from the FIRST memory requirement request. Those values may be
There is a fix for crosvm in review (https://crrev.com/c/6260975) to
not raise an error if the calls are not made in the expected order,
while still maintaining a single stashed buffer. However this means the
memory allocated for one of the two requests must be released, and would
have to be reallocated, at some extra runtime cost as allocating
graphics memory requires allocating physically contiguous memory.
The existing cross-domain code here acquired a simple mutex lock to
maintain a metadata cache, which was held for the duration of the first
call. This change extends the duration of the lock to the entire
allocation request so that the guest always makes the two requests in
the expected order.
BUG=b:395748805,b:355060470
TEST=ARCVM on Corsola starts up under high CPU stress
Change-Id: I6429ea28141ef440345a3eb442066173b3e04802
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6288246
Commit-Queue: Lloyd Pique <lpique@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Lloyd Pique <lpique@google.com>
This reverts commit a9ae53a8c4.
Reason for revert: I modified the wrong file. The correct CL is here aosp/3498986.
Change-Id: I669cb7b08725f3cb501dfa5311703746425771dc
A leftover from prior refactor. Unnecessary and broke android builds.
Fixes: 3ab89b0 ("xe: add initial Xe kmd support for gen12 xelp")
BUG=b:358427077
TEST=Builds + CQ
Change-Id: I7ed2317409c2c381a244d714a26201662151adfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6250261
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Matt Turner <msturner@google.com>
Auto-Submit: Ryan Neph <ryanneph@google.com>
Commit-Queue: Matt Turner <msturner@google.com>
Tested-by: Ryan Neph <ryanneph@google.com>
The Xe kmd requires it but it was missed when calculating the total_size
of YVU420_ANDROID buffers.
BUG=b:358427077
TEST=drm-tests
Change-Id: I2f201b9ba7d12a70074333f6ad4a0fbfeb77c3a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6245162
Tested-by: Ryan Neph <ryanneph@google.com>
Reviewed-by: Matt Turner <msturner@google.com>
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Lina Versace <linyaa@google.com>
gen12_ids array is inclusive of most of the ids in other arrays, so it
should be treated as a least-specific-fallback to the others, and come
last in search order and only if not matched in more-specific arrays
searched earlier.
BUG=b:358427077
TEST=drm-tests
Change-Id: I4f66b6a945d2dfa7288a81dfe3f314a9f2f63273
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6245161
Reviewed-by: Lina Versace <linyaa@google.com>
Reviewed-by: Matt Turner <msturner@google.com>
Tested-by: Ryan Neph <ryanneph@google.com>
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
Adds a new intel backend for interfacing with the Xe kernel driver.
Currently only tested on gen12 (Xe1; e.g. TGL, ADL, MTL).
Test 1: drm-tests (natively): stop ui and then run:
- mapped_texture_test
- null_platform_test -m [I915_FORMAT_MOD_X_TILED|I915_FORMAT_MOD_Y_TILED]
- plane_test (by default it uses NV12)
Test 2: full OS: boot to UI, execute webGL and/or YouTube successfully and watch
the terminal: TERM=xterm watch -n1 -d cat /sys/kernel/debug/dri/0/i915_display_info
for color formats and display plane usage
v1: Carlos Santa <carlos.santa@intel.corp-partner.google.com>
v2: Ryan Neph <ryanneph@google.com>
- formatting fixes
- remove deprecated #ifdef I915_SCANOUT_Y_TILED conditional compilation
- add missing backend_xe implementations
- mimic i915_add_combinations
- Match formatting, order of operations, and add the missing combo for
YVU420_ANDROID + USE_CAMERA_WRITE.
- In a future CL, we'll factor this into a common function called by both
backends.
- simplify xe_bo_map()
- The conditional body is always taken, so remove the conditional entirely.
- mark late-gen12 as mtl_or_newer until proper version handling is used.
BUG=b:358427077
TEST=drm-tests (see above)
Change-Id: I1eaa1dcce6cee706a421b3c4d6a532a6b83f8564
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6245159
Tested-by: Ryan Neph <ryanneph@google.com>
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Matt Turner <msturner@google.com>
Reviewed-by: Lina Versace <linyaa@google.com>
Previous to this CL, cros_codecs caused a build failure in soong
with the following message:
error: system/cros-codecs/Android.bp:17:1: module "libcros_codecs"
variant "android_arm64_armv8-2a_cortex-a55_rlib_rlib-std": depends
on //external/minigbm:libgbm_sys which is not visible to this module
You may need to add "//system/cros-codecs" to its visibility
This CL updates libgbm_sys's visibility with cros_codecs.
Bug: 389780527
Test: Build cros_codecs with libgbm_sys as a depedency.
Change-Id: Id4538880193adfda55d755449d1984d83b0a6919
This CL consolidates the logic for enabling write-combining on map and
applies it also to the offset map codepath.
BUG=b:371546474
TEST=CQ
Change-Id: Iedb812339f12a5d11386266565168ba06c9f11da
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6022557
Reviewed-by: Ryan Neph <ryanneph@google.com>
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Tested-by: Eliot Courtney <edcourtney@chromium.org>
am skip reason: Merged-In I8643bba907f1f6f7610e6c9cddcbad597a74f270 with SHA-1 4a73529836 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/3427401
Change-Id: Iba8374dfbe6f9bf91f406e744f502d331cb3bfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
