| commit | b1dc3731382333c64f1e3af301f8041911f107ca | [log] [tgz] |
|---|---|---|
| author | Marcin Radomski <dextero@google.com> | Tue Mar 12 14:52:04 2024 +0000 |
| committer | Marcin Radomski <dextero@google.com> | Tue Mar 12 14:52:29 2024 +0000 |
| tree | c28403a41a30f971bcb538c6b28ef19f14fc4184 | |
| parent | 4eceb378d6a3552d85df4285c469b1cd5ab70cad [diff] | |
| parent | 40b28f098a29589b3f72de1ba6753d46a616c48b [diff] |
Merge remote-tracking branch 'cros/main' 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