summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2024-02-28mali_pixel: Refactor SLC partition managementJack Diver
Bug: 313458962 Bug: 290354607 Test: gfxbench Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:737eec95fa7ace1075ad73c1ab440408df4c0a10) Merged-In: I30312e9fcb5f9a26ce47f3757948d47e13e9182f Change-Id: I30312e9fcb5f9a26ce47f3757948d47e13e9182f
2024-02-28mali_kbase: platform: Drop SLC demand on context idleJack Diver
Drop demand to 0 on context idle Bug: 296485687 Test: gfxbench background task Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:b9d48114d56973c60294ec4b94d06d63b845f1ea) Merged-In: I7ca904323c365c6e5e3ab57e23457fca397cf7ae Change-Id: I7ca904323c365c6e5e3ab57e23457fca397cf7ae
2024-02-28mali_kbase: platform: Add additional platform hooksJack Diver
Add: * platform_handler_context_active * platform_handler_context_idle Bug: 296485687 Signed-off-by: Jack Diver <diverj@google.com> (cherry picked from https://partner-android-review.googlesource.com/q/commit:fe220ffcb70d0c3188a6fe0e1e01458573ea1baf) Merged-In: If0a39f375a08ebb6674c7fb8aee0669c618dd9fa Change-Id: If0a39f375a08ebb6674c7fb8aee0669c618dd9fa
2024-02-27Use PAGE_SIZE dependent orderandroid-u-qpr3-beta-2.1_r0.7android-u-qpr3-beta-2.1_r0.5android-u-qpr3-beta-2.1_r0.3android-u-qpr3-beta-2.1_r0.2android-u-qpr3-beta-2.1_r0.1android-gs-tangorpro-5.10-android14-qpr3-betaandroid-gs-raviole-5.10-android14-qpr3-betaandroid-gs-lynx-5.10-android14-qpr3-betaandroid-gs-felix-5.10-android14-qpr3-betaandroid-gs-bluejay-5.10-android14-qpr3-betaVamsidhar reddy Gaddam
Using hardcoded page order is problematic for 16k page support. Using the same logic that DDK uses in our integration code as well. Bug: 324571986 Test: local build Change-Id: I6509fb35418d85045b0d4f788c47c5cae1f6da64 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-02-25Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 605678113 Change-Id: If06ce446c9a36df7852f5263daae715e07872669 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-19Free kprcs in the kobject release callbackVamsidhar reddy Gaddam
Freeing kprcs using kfree() triggered a bunch of warning in debug_api kernel build flavor. Bug: 325892033 Test: Make sure that debug_api build does not trigger a warning. Change-Id: Iddea1d12a9190fa328b488ee01065c5e2abc9557 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-02-18Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 605678113 Change-Id: I27e9fd48e364464bc46a0738997d7eae4c2fbfb0 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-16GPUCORE-40994 robustness enhancementandroid-15-dp-2_r0.5android-15-dp-2_r0.4android-15-dp-2_r0.3android-15-dp-2_r0.2Samuel Percival
Improve MMU page teardown. Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/6429 Test: local build and boot Bug: 315967882 Signed-off-by: Renato Grottesi <otaner@google.com> Change-Id: Idb0afac63d6ee5f13f7fd72b7060e3fd1f49391a
2024-02-07Remove IFPO from KMDVamsidhar reddy Gaddam
IFPO feature has been unusued and only creates overhead for smooth driver updates. Bug: 324019470 Change-Id: Iab65e95b9ba21d74cc158557e3fa78d4478c9a71 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-02-07Clean-up left-over unnecessary stabiity fixesVamsidhar reddy Gaddam
This commit removes the following additions: * SHA1: 76ee8a596d1df56bd958e2197abcc3e8b4849171 * SHA1: d6c306f413a32d460c310aab5c3f7f5449ed5599 * SHA1: 3a6116996ae69b28bd2f78093045582a1f06f71e as none of them are required anymore and they interact poorly with DDK upgrades. Bug: 321195074 Test: Local & abtd Change-Id: I7e4daf7bed82e4162413d7f38ce2a6d65172cbfe Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-02-04Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 603054162 Change-Id: Ifb4b3eabd13347ac888d117f2ebea44a07b4456f Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-30kbase: Reduce CSG suspend timeout to unblock system suspendandroid-u-qpr3-beta-2_r0.7android-u-qpr3-beta-2_r0.6android-u-qpr3-beta-2_r0.5android-u-qpr3-beta-2_r0.4android-u-qpr3-beta-2_r0.3android-u-qpr3-beta-2_r0.2android-15-dp-2_r0.6android-15-dp-2_r0.1Varad Gautam
Bug: 319408928 Test: Build and boot Change-Id: I8d577c15498cdb41116142238a4a7f7bde7bdf8a Signed-off-by: Varad Gautam <varadgautam@google.com>
2024-01-28Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 571992243 Change-Id: If44aa83f1fd1e3e3faed16efe2ee089b33142a60 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-25mali_kbase: add NULL checks before global_iface register dumpAnkit Goyal
Based on the commit 440a991eda5dfb08e9f6ba1234a475dd8bd89325 with further changes. Bug: 320427777 Test: Manually tested the error path. Signed-off-by: Shashank Sharma <shawshanks@google.com> Change-Id: Ibb4b18ae14f8ec03379acf2b4892b212b46607c3
2024-01-22Use the new way to access GPU registersVamsidhar reddy Gaddam
R47P0 refactored the way registers are accessed causing our additional debug logging to access invalid addresses. Bug: 321645561 Test: Locally verified by timeout on suspend. Change-Id: I772601c08551a92916c03b2e0d24f5f1476f6cf6 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-01-22[Mali KMD] Add a fallback fw pathVamsidhar reddy Gaddam
This commit adds a fallback path to load the default firmware if the release versioned firmware fails to load. Bug: 297471843 Test: Locally booted with & without release firmware Change-Id: Ie5321ef334e47293c1a42f37dc0473caaaa345f9 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-01-21Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I5db256e800446e0b66c7734e3bb0482ac56879f2 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-18mali_kbase: Avoid duplicate SLC migrationsMattias Simonsson
Bug: 301208289 Test: gfxbench Change-Id: I799115a5c3a6221c074c20b037d51e7a93d96845 Signed-off-by: Mattias Simonsson <mattiass@google.com>
2024-01-15[Official] MIDCET-4922, GPUCORE-40482 Emitting unmerged gpu_metrics tracepointsKevin Park
There might be multiple GPU activities in a work period (500ms). Current gpu_metrics implementation merged all GPU activities for the given work period and emit single tracepoint rather than emitting per-activity multiple tracepoints. This loses the granularity of each activity even if the total active time of a context (application) for a work period is correct. For better granularity, we instead emit one tracepoint per GPU activity. Since we don't have to merge activities in a work period, some members of struct kbase_gpu_metrics_ctx are no longer needed. |------------------- Work-period 1 -----------------------| S1---E1 S2----E2 S3------------E3 For work-period 1, previously 1 tracepoint was emitted and now 3 will be emitted for better granularity of GPU activity. |------------------- Work-period 2 -----------------------| S1---E1 S2--------E2 S3------------------E3 For work-period 2 (overlapped case), they will be treated as 1 activity. Hence 1 tracepoint will be emitted as previously. 'multiple null jobs' will be skipped as the kbase change will emit tracepoint per each activity. Bug: 301904509 Test: Perfetto trace inspection (Oriole, Felix, Husky) Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/6314 Change-Id: I21b8ebe7af3b429dcd9fef20dabf97295a2a5ab7 Signed-off-by: Mattias Simonsson <mattiass@google.com>
2024-01-14Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 571992243 Change-Id: If2216ffa8b46dbc736ed4347556bf5bf4cba214c Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-10Fix cleanup paths of kbase_csf_scheduler_init and kbase_csf_scheduler_termAlina Kalyakina
Now kbase_csf_scheduler_init does cleanup if mali-gpuq-kthread wasn't created and kbase_csf_scheduler_term tries to stop the thread only if it doesn't have error Bug: 318576353 Provenance: b/305128960#comment7 Change-Id: I008d11ead3388919dd4e7ce8ee5540785a3d26a3 Signed-off-by: Alina Kalyakina <alinakalyakina@google.com>
2024-01-10Minor fixes for MIDCET-5076android-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1Vamsidhar reddy Gaddam
In R47P0, MIDCET-5076 had a few issues. These are fixes on top of the upstream driver. Bug: 315967882 Test: Compile & Boot Change-Id: I43707ff80a660455439c0ab5350e9ce192179af0 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-01-10Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10Pindar Yang
Bug: 300854197 Change-Id: I53af79897a341c292f01f773e4271188f3a1131b Signed-off-by: Pindar Yang <pindaryang@google.com>
2024-01-10Merge "Merge android13-gs-pixel-5.10-24Q1 into android13-gs-pixel-5.10-24Q2" ↵Pindar Yang
into android13-gs-pixel-5.10-24Q2
2024-01-09mali_kbase: Add more gpu error eventsVarad Gautam
Bug: 312206733 Change-Id: I154b927152d768944e02fe6083e66bdbb0f47e3a Signed-off-by: Varad Gautam <varadgautam@google.com>
2024-01-09mali_kbase: pixel: Add a helper to send error ueventsVarad Gautam
and use it throughout kbase. Bug: 312206733 Change-Id: Iba908d1dff259aef4bfc35d0ca9df8682e759a9c Signed-off-by: Varad Gautam <varadgautam@google.com>
2024-01-09mali_kbase: pixel: WARN_ON pixel_gpu_uevent_send() from interrupt ctxVarad Gautam
kobject_uevent_env() shouldn't be called from an interrutpt ctx. Log a warning and return early if pixel_gpu_uevent_send() is accidentally called from an interrupt. Bug: 312206733 Change-Id: I66dc5f14c4bf736ffa423aed701906d9da5e00ec Signed-off-by: Varad Gautam <varadgautam@google.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 02:47:27 +0000