diff options
| author | Ilamparithi Mahendran <ilamparithim@google.com> | 2022-04-04 07:04:43 +0000 |
|---|---|---|
| committer | Ilamparithi Mahendran <ilamparithim@google.com> | 2022-04-04 07:19:27 +0000 |
| commit | 14814a3c18c7057fe4bea3f0f41bcd7b4af5bda4 (patch) | |
| tree | b5612c1a101ea547f2e8c6cf48062672c97450ec /gxp-debugfs.c | |
| parent | a739c7f7e74e637cf882fa9ee73dee0aeb4374ee (diff) | |
| download | gs201-14814a3c18c7057fe4bea3f0f41bcd7b4af5bda4.tar.gz | |
Merge branch 'gs201-release' to android13-gs-pixel-5.10
* gs201-release:
gxp: remove redundant aurora_base global var
Bug: 176984045
gxp: remove obsolete TODO of wakelock
Bug: 201600514
gxp: correct frequency values for the memory rail
Bug: 227334108
gxp: Enforce required wakelocks on OOD IOCTLs
gxp: Cleanup and rearrange the IOCTLs ordering
gxp: Split version info into its own IOCTL
gxp: Fix a race condition in response processing
Bug: 226982987
gxp: Fix non-aggressor flag behavior bugs
Bug: 226682644
gxp: Require BLOCK wakelock to read global counter
Bug: 225402208
gxp: Clean-up pending commands on mailbox close
Bug: 194060459, 184572070
gxp: Add missing break in gxp_ioctl()
Bug: 226501806
gxp: fix the READY state support in mailbox ioctl
Bug: b/226281679
gxp: set non-aggressor bit with non-aggressor vote
Bug: 221320387
gxp: support NON_AGGRESSOR flag in power IOCTLs
Bug: 221320387
Signed-off-by: Ilamparithi Mahendran <ilamparithim@google.com>
Change-Id: I397bf1e41305d2c3b10ad4073d4ba2d81da99de9
Diffstat (limited to 'gxp-debugfs.c')
| -rw-r--r-- | gxp-debugfs.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gxp-debugfs.c b/gxp-debugfs.c index ef2c072..0d9dae6 100644 --- a/gxp-debugfs.c +++ b/gxp-debugfs.c @@ -157,7 +157,8 @@ static int gxp_firmware_run_set(void *data, u64 val) goto err_wakelock; } gxp->debugfs_client->has_block_wakelock = true; - gxp_pm_update_requested_power_state(gxp, AUR_OFF, AUR_UUD); + gxp_pm_update_requested_power_state(gxp, AUR_OFF, true, AUR_UUD, + true); down_write(&gxp->vd_semaphore); ret = gxp_vd_start(gxp->debugfs_client->vd); @@ -180,7 +181,8 @@ static int gxp_firmware_run_set(void *data, u64 val) */ gxp_client_destroy(gxp->debugfs_client); gxp->debugfs_client = NULL; - gxp_pm_update_requested_power_state(gxp, AUR_UUD, AUR_OFF); + gxp_pm_update_requested_power_state(gxp, AUR_UUD, true, AUR_OFF, + true); } out: @@ -190,7 +192,7 @@ out: err_start: gxp_wakelock_release(gxp); - gxp_pm_update_requested_power_state(gxp, AUR_UUD, AUR_OFF); + gxp_pm_update_requested_power_state(gxp, AUR_UUD, true, AUR_OFF, true); err_wakelock: /* Destroying a client cleans up any VDss or wakelocks it held. */ gxp_client_destroy(gxp->debugfs_client); @@ -234,7 +236,8 @@ static int gxp_wakelock_set(void *data, u64 val) goto out; } gxp->debugfs_wakelock_held = true; - gxp_pm_update_requested_power_state(gxp, AUR_OFF, AUR_UUD); + gxp_pm_update_requested_power_state(gxp, AUR_OFF, true, AUR_UUD, + true); } else { /* Wakelock Release */ if (!gxp->debugfs_wakelock_held) { @@ -245,7 +248,8 @@ static int gxp_wakelock_set(void *data, u64 val) gxp_wakelock_release(gxp); gxp->debugfs_wakelock_held = false; - gxp_pm_update_requested_power_state(gxp, AUR_UUD, AUR_OFF); + gxp_pm_update_requested_power_state(gxp, AUR_UUD, true, AUR_OFF, + true); } out: |