summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-14[DO NOT MERGE ANYWHERE] mali_kbase: Prevent page migration for shrinkable ↵android-u-qpr3-beta-2.1_r0.8android-gs-shusky-5.15-android14-qpr3-betaJack Diver
regions Bug: 324565943 Change-Id: I706bef805b96113ad4dc1b44d3ea1a8f12652965 Signed-off-by: Jack Diver <diverj@google.com>
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mali_pixel: Refactor SLC partition management"Jack Diver
Revert submission 2720133-gpu-slcv2 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2720133-gpu-slcv2 Bug: 329447972 Change-Id: I2e6875870d74b495e0afe722a046ba201c94aca6
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: Remove liveness based SLC"Jack Diver
Revert submission 2720133-gpu-slcv2 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2720133-gpu-slcv2 Bug: 329447972 Change-Id: I43e861ebe115133269f6151c9b5afa95878efaf2
2024-03-13[DO NOT MERGE ANYWHERE] Revert^2 "mali_pixel: mgm: Compensate for group ↵Jack Diver
migration" f43b42cacab9027492afaf90d534f6b2955a176d Bug: 329447972 Change-Id: I502eb1891e08a5adba32ccf8564d2e0d2a8304bf
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mali_pixel: Implement SLC partition ref ↵Jack Diver
counting" Revert submission 2720133-gpu-slcv2 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2720133-gpu-slcv2 Bug: 329447972 Change-Id: I0004c74be35603ab8f91d0b93eb6bdf9ea3dc10b
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mali_pixel: Periodically read ACPM GPU signal"Jack Diver
Revert submission 2720133-gpu-slcv2 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2720133-gpu-slcv2 Bug: 329447972 Change-Id: Id008ebd75ccddb8d034007817baa0cd4857b06a6
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mali_kbase: Repurpose liveness ioctl as SLC ↵Jack Diver
signal" Revert submission 2720133-gpu-slcv2 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2720133-gpu-slcv2 Bug: 329447972 Change-Id: I9eff61b27fbac2046185d8e4f9d5b64ff07d0d9f
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mali_kbase: mali_pixel: Define ↵Jack Diver
PIXEL_GPU_SLC_ACPM_SIGNAL..." Revert submission 2720133-gpu-slcv2 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2720133-gpu-slcv2 Bug: 329447972 Change-Id: Id61b0df61f55a62db3e3fa0126be32cf4cf975eb
2024-03-13[DO NOT MERGE ANYWHERE] Revert "mgm: sysfs node to manually retain SLC ↵Jack Diver
partition" Reason for revert: Prebuild did not land before cutoff This reverts commit 4f276f684312fa600b038553e1ad2b357034dd91. Bug: 329447972 Change-Id: I8e01952ab3c92ad5ddc71eddbba70f4ca1395af2 Signed-off-by: Jack Diver <diverj@google.com>
2024-03-06[automerger skipped] mali_kbase: Prevent page migration for shrinkable ↵Jack Diver
regions am: 9166445b9d -s ours am skip reason: skipped by mjstokes Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2758972 Change-Id: I3833da89cca448a1f583cde01c385407337219b6 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.77android-gs-shusky-5.15-android14-qpr2Jack Diver
Bug: 324565943 Change-Id: I706bef805b96113ad4dc1b44d3ea1a8f12652965 Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28mgm: sysfs node to manually retain SLC partitionJack 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 Change-Id: I5d316d9277c7f514039581f95188f14f86bd87c2 Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28Merge "Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2" ↵Vamsidhar reddy Gaddam
into android14-gs-pixel-5.15-24Q2
2024-02-28mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL on ZumaJack Diver
Bug: 313458962 Test: gfxbench Change-Id: Ifd1f9946b2a3c78c412986c57e499b9bd2ef4b3c Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28mali_kbase: Repurpose liveness ioctl as SLC signalJack Diver
Bug: 321199350 Test: gfxbench Change-Id: I94ff92333cae9b9c54f27af550777fc21da06cb7 Signed-off-by: Jack Diver <diverj@google.com>
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 Change-Id: Ife0adedf6006daaf17062a0f555d126c1fd45465 Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28mali_pixel: Implement SLC partition ref countingJack Diver
Bug: 313458962 Test: gfxbench Change-Id: Id2ab03db4b8b3122bc1f87ecb97715fa3a5d80e4 Signed-off-by: Jack Diver <diverj@google.com>
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 Change-Id: Ifbbc26e45c68337de901ab26e502a0644e8433ff Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28mali_kbase: platform: Remove liveness based SLCJack Diver
Bug: 313458962 Test: gfxbench Change-Id: I74a81b54764da315510ce988d0aa450b2761725f Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28mali_pixel: Refactor SLC partition managementJack Diver
Bug: 313458962 Bug: 290354607 Test: gfxbench Change-Id: I30312e9fcb5f9a26ce47f3757948d47e13e9182f Signed-off-by: Jack Diver <diverj@google.com>
2024-02-28Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2Vamsidhar reddy Gaddam
Bug: 324571986 Test: Local build Change-Id: Ic514c3b9d35f5ec5fa3f8dadb7f66739ed3600a4 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
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-26Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2Vamsidhar reddy Gaddam
Bug: 325892033 Test: Local build & boot Change-Id: Iacb730371f0807713b31375c595d357438587131 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-02-20Re-enable WA for BASE_HW_ISSUE_TITANHW_2922Vamsidhar reddy Gaddam
Bug: 321195074 Test: Angle testing on ABTD Change-Id: I1e3d107c621e671fe835470ba21f695b7023e369 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.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-16GPUCORE-40994 robustness enhancementandroid-15-dp-2_r0.7Samuel 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-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-14Clean IFPO left-overs in 5.15 branchVamsidhar reddy Gaddam
Stale IFPO code that did not get removed by up-merge from 5.10 is now removed. Bug: 324019470 Test: Local build Change-Id: I8e82bf7e50573d866bcc60edf6776ebf993472fb Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-02-12Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2android-u-qpr3-beta-2_r0.8Vamsidhar reddy Gaddam
Up-merge IFPO removal Bug: 324019470 Test: local build & boot Husky Change-Id: I0e70c39798e143e3e6f5dd330dda3b637981dfec Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
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-06mali_kbase: rename NSECS_PER_MICROSECSBruno BELANYI
The variable was clearly misnamed, as we go from `*_ms` (milliseconds) to `*_ns` (nanoseconds): the value was correct but not the name. Bug: 315765217 Test: build kernel Change-Id: I260e9572b1a984472907fdae4482c9f394f12e04 Signed-off-by: Bruno BELANYI <ambroisie@google.com>
2024-01-31kbase: Reduce CSG suspend timeout to unblock system suspendVarad Gautam
Bug: 319408928 Test: Build and boot Change-Id: I8d577c15498cdb41116142238a4a7f7bde7bdf8a Signed-off-by: Varad Gautam <varadgautam@google.com> (cherry picked from commit a5801fb8227b719291fb7133491e9fc6b8444661)
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-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-24Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2Vamsidhar reddy Gaddam
In addition, bring along fixes landed on 5.10 Bug: 315267052 Change-Id: I52e3637e648cb3bd7beb0bc93bf4022baf81f0ac Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-01-24Fix R47P0 regressionsVamsidhar reddy Gaddam
* Disabling BASE_HW_ISSUE_TITANHW_2922 due to regressions. * Remove a0a13c1c14e057b033448c2c8fcc84031ee96301 as it is not needed. Bug: 315267052 Change-Id: Id124a33795f1aba5ea99b7c4ca1053e98f380f52 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
2024-01-24Revert^2 "Merge branch 'android13-gs-pixel-5.10-24Q2' into ↵Vamsidhar reddy Gaddam
android14-gs-pixel-5.15-24Q2" This reverts commit 36153e5c89f43c7e0dd0a27fab7179aa6c10449e. Reason for revert: Relanding R47P0 for b/315267052 Bug: 315267052 Change-Id: I5620ace10d9612e239590a9463b81e3da0533c42 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
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-19Revert "Merge branch 'android13-gs-pixel-5.10-24Q2' into ↵Vamsidhar reddy Gaddam
android14-gs-pixel-5.15-24Q2" This reverts commit 2dda70959bde38dafe50ae336790a6c850845bba. Reason for revert: b/321017740 Bug: 321017740 Change-Id: I8977df5e7fffd37259fda335b6e93830881f1d40 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.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-17Add capacity headroom node and gpu_dvfs_governor_capacity_use_mcu_utilSean Callanan
Adjusted the quickstep governor to adjust for headroom based on hints from userspace. Also added a (non-default) governor which adjusts utilization based entirely on GPU capacity rather than following a table. Bug: 290625326 Test: boot, switch governors, send capacity hints to both governors Test: gfxbench Test: uibench Change-Id: I745c20098ef970d00d92b2294e3b116bdb0e8a85 Signed-off-by: Sean Callanan <spyffe@google.com>
2024-01-16Merge "Merge branch 'android13-gs-pixel-5.10-24Q2' into ↵Vamsidhar reddy Gaddam
android14-gs-pixel-5.15-24Q2" into android14-gs-pixel-5.15-24Q2
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-10Fix cleanup paths of kbase_csf_scheduler_init and kbase_csf_scheduler_termandroid-u-qpr3-beta-1_r0.8android-15-dp-1_r0.8Alina 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-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-10Merge branch 'android13-gs-pixel-5.10-24Q2' into android14-gs-pixel-5.15-24Q2Vamsidhar reddy Gaddam
Includes an update of KMD to R47P0 Bug: 315267052 Test: Outlined in go/pixel-gpu-kmd-r47p0 Change-Id: Id2dea0f6c1edf6fae1631352f63783b2d99377e2 Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@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 "Merge android13-gs-pixel-5.10-24Q1 into android13-gs-pixel-5.10-24Q2" ↵Pindar Yang
into android13-gs-pixel-5.10-24Q2