summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-10Merge branch 'upstream' into HEADandroid-15-beta-2_r0.5android-15-beta-2_r0.2android-15-beta-2_r0.1android-gs-raviole-5.10-android15-betaandroid-gs-felix-5.10-android15-betaandroid-gs-bluejay-5.10-android15-betaVamsidhar reddy Gaddam
Bring in R48P0 KMD update along. Bug: 323316466 Test: go/pixel-gpu-kmd-r48p0 Change-Id: I32484fe3e881ec9ec60cfeac27befc84d15b7904 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-04-10GPUCORE-41611: Debug num_valid_entries > 512 warning issueAkash Goel
Adding extra output for the num_valid_entries > 512 assertion. Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/6548 Bug: 315967882 Test: Local boot and run of GFXBench5 Signed-off-by: Renato Grottesi <otaner@google.com> Change-Id: I9f7b385777688e77389656f8bfd06c0bc493a567
2024-03-19GPUCORE-41458 am: 4e0eb5e185android-15-beta-2_r0.6android-15-beta-2_r0.4android-15-beta-2_r0.3android-gs-tangorpro-5.10-android15-betaandroid-gs-pantah-5.10-android15-betaandroid-gs-lynx-5.10-android15-betaRaffaele Aquilone
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2768574 Change-Id: I8114200161716909e896b119eea74ddec51f0409 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19GPUCORE-41458Raffaele Aquilone
Bug: 329096276 Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/6509 Change-Id: Ib283b858b8622380d876b00f9d743e8375f82627 Signed-off-by: Michael Stokes <mjstokes@google.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] mali_kbase: Prevent page ↵Jack Diver
migration for shrinkable regions am: 0f87558146 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2768577 Change-Id: Id7c84b7ed192d3227018c8f6cff2e5d6c263c47d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: ↵Jack Diver
Add additional platform hooks" am: fd025f58ca -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766184 Change-Id: I6e048acb3b6ed86beaa74ef139037bfa3d943f8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: ↵Jack Diver
Drop SLC demand on context idle" am: cdce8efe7f -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766183 Change-Id: I39fb89ba655425186ef44ae298f3ae2fa1940ffd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_pixel: Refactor ↵Jack Diver
SLC partition management" am: 19b46b5347 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766182 Change-Id: Iacc28949e1bc0ceae04c226463805acf167680f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: ↵Jack Diver
Remove liveness based SLC" am: ad771ce991 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766181 Change-Id: I3a31e899dd5bb8b02bd1f072a83160fcf5bc2132 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert^2 "mali_pixel: mgm: ↵Jack Diver
Compensate for group migration" am: 9052ae5d77 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766180 Change-Id: I53a16fd8ae53b789dd15b61698bf4b233e63f552 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_pixel: Implement ↵Jack Diver
SLC partition ref counting" am: a964676225 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766179 Change-Id: Ib0912541270067e222e1960e7fb88ab799f640b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_pixel: ↵Jack Diver
Periodically read ACPM GPU signal" am: 1dd0e69d46 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766178 Change-Id: I711bcf85ea107a43b96bd8d816cb3843bb8a5c22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_kbase: Repurpose ↵Jack Diver
liveness ioctl as SLC signal" am: b181366343 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766177 Change-Id: I467d2f983e644410c194020f4cfc5d58e904bf01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mali_kbase: mali_pixel: ↵Jack Diver
Define PIXEL_GPU_SLC_ACPM_SIGNAL..." am: baa5e756f3 -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766176 Change-Id: I8f2422a8fe1d7c8e769ebeb35199b7bf453710b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19[automerger skipped] [DO NOT MERGE ANYWHERE] Revert "mgm: sysfs node to ↵Jack Diver
manually retain SLC partition" am: a4576945ec -s ours am skip reason: contains skip directive Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2766175 Change-Id: I3b1eabf8eaa8fe09068afc0079278a399095d453 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15[DO NOT MERGE ANYWHERE] mali_kbase: Prevent page migration for shrinkable ↵android-u-qpr3-beta-2.1_r0.4android-gs-pantah-5.10-android14-qpr3-betaJack Diver
regions Bug: 324565943 Change-Id: I706bef805b96113ad4dc1b44d3ea1a8f12652965 Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from commit 0ade90bc0ce15b8bfc74a7a42e1a48a4b1d1312f)
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: Add additional ↵Jack Diver
platform hooks" Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I24e2d118d0b3dfce52791c74825ddd150d56f660
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: Drop SLC demand on ↵Jack Diver
context idle" Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I9fd9a733a844bdc037b2ccbac2c8daf44186d319
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_pixel: Refactor SLC partition management"Jack Diver
Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I59fcb56a434c21cc3bdfdacaf3c3978d548330ad
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: Remove liveness based SLC"Jack Diver
Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I60d8cbb170affb4edc126aeee390b16935244b21
2024-03-14[DO NOT MERGE ANYWHERE] Revert^2 "mali_pixel: mgm: Compensate for group ↵Jack Diver
migration" 2dd21a70c75d09b6e73838f8882e19dd734a66f0 Bug: 329447972 Change-Id: Ic4b43ec6ed408d471b50c773dbc4f74a474dc018
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_pixel: Implement SLC partition ref ↵Jack Diver
counting" Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I13716375afbe5be1ae04eb059ed24e8780e503cd
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_pixel: Periodically read ACPM GPU signal"Jack Diver
Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I61f877019194c4c86cc0df79ea466adecceaef19
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_kbase: Repurpose liveness ioctl as SLC ↵Jack Diver
signal" Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I687f950650aaf9a4c243e9474b53d47563e194a1
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mali_kbase: mali_pixel: Define ↵Jack Diver
PIXEL_GPU_SLC_ACPM_SIGNAL..." Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I120f7ae7d8accac0cb0d81a10457c630c0f2056a
2024-03-14[DO NOT MERGE ANYWHERE] Revert "mgm: sysfs node to manually retain SLC ↵Jack Diver
partition" Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I8216424d3713d063b0f24f33a65162541cfda408
2024-03-13Update KMD to r48p0Vamsidhar reddy Gaddam
Provenance: ipdelivery@02a6b5e039b17fd395ddc13d09efbe440223a56c Change-Id: Ia6d72d40f5c57508d818ad24e57547c1a411d644 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-03-07[automerger skipped] mali_kbase: Prevent page migration for shrinkable ↵android-15-beta-1_r0.5android-15-beta-1_r0.3android-gs-raviole-5.10-android15-dpandroid-gs-lynx-5.10-android15-dpJack Diver
regions am: 90891bf294 -s ours am: 1070f52fcd -s ours am skip reason: skipped by mjstokes Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2758973 Change-Id: I87417b68bd868b352cfa65901e0c76de45a2f034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06[automerger skipped] mali_kbase: Prevent page migration for shrinkable ↵Jack Diver
regions am: 90891bf294 -s ours am skip reason: skipped by mjstokes Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2758973 Change-Id: I043daac3d2d3544dc6149cb17e6da9be2045c3ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_kbase: Prevent page migration for shrinkable regionsandroid-14.0.0_r0.76android-14.0.0_r0.75android-14.0.0_r0.74android-14.0.0_r0.73android-14.0.0_r0.72android-14.0.0_r0.71android-gs-tangorpro-5.10-android14-qpr2android-gs-raviole-5.10-android14-qpr2android-gs-pantah-5.10-android14-qpr2android-gs-lynx-5.10-android14-qpr2android-gs-felix-5.10-android14-qpr2android-gs-bluejay-5.10-android14-qpr2Jack Diver
Bug: 324565943 Change-Id: I706bef805b96113ad4dc1b44d3ea1a8f12652965 Signed-off-by: Jack Diver <diverj@google.com>
2024-03-05Merge "Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10" into ↵Treehugger Robot
android13-gs-pixel-5.10
2024-03-05mgm: sysfs node to manually retain SLC partition am: 01d962ed80Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753879 Change-Id: I306292b24e42669dde336c5f41e64183cff16c37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL on Zuma am: 0e82736f48Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753878 Change-Id: I67fd68352a3cf2992993dec6820d439989d9f7ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_kbase: Repurpose liveness ioctl as SLC signal am: eb7183da31Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753877 Change-Id: Ifbe4138df38c09c28dfc4e08c631c04d14f44d22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_pixel: Periodically read ACPM GPU signal am: fffc58d2b4Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753876 Change-Id: If0496c272d812d6b7f37fe6bd63c5bc3c804076d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_pixel: Implement SLC partition ref counting am: ee7d8af92aJack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753875 Change-Id: Id4f58e19028f776951e448515494b4052a0ed188 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05Revert "mali_pixel: mgm: Compensate for group migration" am: 2dd21a70c7Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753874 Change-Id: I3cf6b99850f4a71e13aa513f5b43dbc85f42fa82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_kbase: platform: Remove liveness based SLC am: 1315948510Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753593 Change-Id: I0f4a109d450b9dfdb2f7329421eef11b10df2518 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_pixel: Refactor SLC partition management am: 000dfb19f8Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753592 Change-Id: I2458e1d98cdadfc9158bd182a8f0b4090a535d26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_kbase: platform: Drop SLC demand on context idle am: 52f6f40c01Jack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753873 Change-Id: I25b43ea7952a47db8bea5a08f55e6f95acc34be3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05mali_kbase: platform: Add additional platform hooks am: 26a4b35b1eJack Diver
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753872 Change-Id: Id930f175f8471d7f5b86fa44ef1ba5b635d69f92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05Use PAGE_SIZE dependent order am: 5f3c617c62Vamsidhar reddy Gaddam
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2750913 Change-Id: I6fede568740f3c05bae3cd75fabba52f94af38ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-03Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 610748217 Change-Id: Ic0a2cbc88f49f284b747445ae422f139e14a7842 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-28mgm: sysfs node to manually retain SLC partitionandroid-15-beta-1_r0.6android-15-beta-1_r0.4android-15-beta-1_r0.2android-15-beta-1_r0.1android-gs-tangorpro-5.10-android15-dpandroid-gs-pantah-5.10-android15-dpandroid-gs-felix-5.10-android15-dpandroid-gs-bluejay-5.10-android15-dpJack Diver
Add sysfs node to manually pin the SLC partition in the enabled state, which is useful when profiling SLC performance. Bug: 313458962 Test: echo 1 > /sys/kernel/pixel_stat/gpu/mem/slc_pin_partition Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:4f276f684312fa600b038553e1ad2b357034dd91) Merged-In: I5d316d9277c7f514039581f95188f14f86bd87c2 Change-Id: I5d316d9277c7f514039581f95188f14f86bd87c2
2024-02-28mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL on ZumaJack Diver
Bug: 313458962 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:3d3cde1cabde47ebb37db73b5e99a238e29b6762) Merged-In: Ifd1f9946b2a3c78c412986c57e499b9bd2ef4b3c Change-Id: Ifd1f9946b2a3c78c412986c57e499b9bd2ef4b3c
2024-02-28mali_kbase: Repurpose liveness ioctl as SLC signalJack Diver
Bug: 321199350 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:57ef78bad803aab9d83325f80349f33727af9af8) Merged-In: I94ff92333cae9b9c54f27af550777fc21da06cb7 Change-Id: I94ff92333cae9b9c54f27af550777fc21da06cb7
2024-02-28mali_pixel: Periodically read ACPM GPU signalJack Diver
Use ACPM GPU signal to make enable/disable decisions for the SLC partition. Currently, the signal is sampled during scheduling tick. Bug: 313458962 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:dec457352147d282921e0ae81ce3a7154e80c64e) Merged-In: Ife0adedf6006daaf17062a0f555d126c1fd45465 Change-Id: Ife0adedf6006daaf17062a0f555d126c1fd45465
2024-02-28mali_pixel: Implement SLC partition ref countingJack Diver
Bug: 313458962 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:ef62a44e1e80286433fae8918996eb57647ba84c) Merged-In: Id2ab03db4b8b3122bc1f87ecb97715fa3a5d80e4 Change-Id: Id2ab03db4b8b3122bc1f87ecb97715fa3a5d80e4
2024-02-28Revert "mali_pixel: mgm: Compensate for group migration"Jack Diver
This reverts commit 7bb27d3d29f850315d0b7ee103fbdfe75e9403da. reason: We don't perform group migration any more, so there is no need to compensate for it. Bug: 313458962 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:f43b42cacab9027492afaf90d534f6b2955a176d) Merged-In: Ifbbc26e45c68337de901ab26e502a0644e8433ff Change-Id: Ifbbc26e45c68337de901ab26e502a0644e8433ff
2024-02-28mali_kbase: platform: Remove liveness based SLCJack Diver
Bug: 313458962 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:89419b7e89dcd2bb9f5c0259e8b5c5a875610131) Merged-In: I74a81b54764da315510ce988d0aa450b2761725f Change-Id: I74a81b54764da315510ce988d0aa450b2761725f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 17:51:20 +0000