lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'cros/main'

Browse source 
To pull in https://crrev.com/c/5352370 and https://crrev.com/c/5352371.

Additionally, add backend_mock.c to Android.bp. It was added in
https://crrev.com/c/4923791, and drv.c uses symbols defined there
unconditionally.

The one merge conflict was an i915->is_media_compression_enabled assert
in i915_num_planes_from_modifier [1] that was removed upstream in
https://crrev.com/c/5118242. The assertion referenced a flag that was
set through an ENABLE_INTEL_MEDIA_COMPRESSION environment variable.
There are no references to that variable in AOSP sources.

[1] https://cs.android.com/android/platform/superproject/main/+/main:external/minigbm/i915.c;l=591;drc=350c09cf0fa662928e208eb6749a1f3ca34dac9f

Bug: b/328181805
Test: lunch aosp_cf_x86_64_only_phone-trunk_staging-userdebug
Test: m && cvd start && atest SurfaceFlinger_test
Change-Id: I8faba268580ad984af92a63c47366d6a69e8c9d0
This commit is contained in:
Marcin Radomski 2024-03-12 14:52:04 +00:00
commit b1dc373138
16 changed files with 457 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cros_gralloc/aidl/Allocator.h
View file

@ -27,10 +27,10 @@ class Allocator : public BnAllocator {
allocator::AllocationResult* outResult) override;
ndk::ScopedAStatus allocate2(const BufferDescriptorInfo& descriptor, int32_t count,
allocator::AllocationResult* outResult) override;
allocator::AllocationResult* outResult) override;
ndk::ScopedAStatus isSupported(const BufferDescriptorInfo& descriptor,
bool* outResult) override;
bool* outResult) override;
ndk::ScopedAStatus getIMapperLibrarySuffix(std::string* outResult) override;