samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: execute NOC reset sequence always in power off

Browse Source 
- always execute noc reset sequnce in power off
 - try to disable hw power always before power down

Change-Id: I76757cccea06a398d1a79310edb688608607a413
Signed-off-by: Deepa Guthyappa Madivalara <quic_dmadival@quicinc.com>
This commit is contained in:
Deepa Guthyappa Madivalara
2023-05-10 17:12:59 -07:00
parent 0eee7ddf6d
commit c971548bee
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
driver/variant/iris33/src/msm_vidc_iris33.c
View File

@@ -285,30 +285,21 @@ static int __power_off_iris33_hardware(struct msm_vidc_core *core)
bool pwr_collapsed = false; bool pwr_collapsed = false;
/* /*
* Incase hw power control is enabled, for both CPU WD, video * Incase hw power control is enabled, for any error case
* hw unresponsive cases, check for power status to decide on * CPU WD, video hw unresponsive cases, NOC error case etc,
* executing NOC reset sequence before disabling power. If there * execute NOC reset sequence before disabling power. If there
* is no CPU WD and hw power control is enabled, fw is expected * is no CPU WD and hw power control is enabled, fw is expected
* to power collapse video hw always. * to power collapse video hw always.
*/ */
if (is_core_sub_state(core, CORE_SUBSTATE_FW_PWR_CTRL)) { if (is_core_sub_state(core, CORE_SUBSTATE_FW_PWR_CTRL)) {
pwr_collapsed = is_iris33_hw_power_collapsed(core); pwr_collapsed = is_iris33_hw_power_collapsed(core);
if (is_core_sub_state(core, CORE_SUBSTATE_CPU_WATCHDOG) || if (pwr_collapsed) {
is_core_sub_state(core, CORE_SUBSTATE_VIDEO_UNRESPONSIVE)) { d_vpr_h("%s: video hw power collapsed %s\n",
if (pwr_collapsed) { __func__, core->sub_state_name);
d_vpr_e("%s: video hw power collapsed %s\n",
__func__, core->sub_state_name);
goto disable_power;
} else {
d_vpr_e("%s: video hw is power ON %s\n",
__func__, core->sub_state_name);
}
} else {
if (!pwr_collapsed)
d_vpr_e("%s: video hw is not power collapsed\n", __func__);
d_vpr_h("%s: disabling hw power\n", __func__);
goto disable_power; goto disable_power;
} else {
d_vpr_e("%s: video hw is power ON, try power collpase hw %s\n",
__func__, core->sub_state_name);
} }
} }
@@ -321,7 +312,7 @@ static int __power_off_iris33_hardware(struct msm_vidc_core *core)
return rc; return rc;
if (value) { if (value) {
d_vpr_h("%s: core clock config not enabled, enabling it to read vcodec registers\n", d_vpr_e("%s: core clock config not enabled, enabling it to read vcodec registers\n",
__func__); __func__);
rc = __write_register(core, WRAPPER_CORE_CLOCK_CONFIG_IRIS33, 0); rc = __write_register(core, WRAPPER_CORE_CLOCK_CONFIG_IRIS33, 0);
if (rc) if (rc)
@@ -336,7 +327,7 @@ static int __power_off_iris33_hardware(struct msm_vidc_core *core)
rc = __read_register_with_poll_timeout(core, VCODEC_SS_IDLE_STATUSn + 4*i, rc = __read_register_with_poll_timeout(core, VCODEC_SS_IDLE_STATUSn + 4*i,
0x400000, 0x400000, 2000, 20000); 0x400000, 0x400000, 2000, 20000);
if (rc) if (rc)
d_vpr_h("%s: VCODEC_SS_IDLE_STATUSn (%d) is not idle (%#x)\n", d_vpr_e("%s: VCODEC_SS_IDLE_STATUSn (%d) is not idle (%#x)\n",
__func__, i, value); __func__, i, value);
} }
@@ -349,7 +340,7 @@ static int __power_off_iris33_hardware(struct msm_vidc_core *core)
rc = __read_register_with_poll_timeout(core, AON_WRAPPER_MVP_NOC_LPI_STATUS, rc = __read_register_with_poll_timeout(core, AON_WRAPPER_MVP_NOC_LPI_STATUS,
0x1, 0x1, 200, 2000); 0x1, 0x1, 200, 2000);
if (rc) if (rc)
d_vpr_h("%s: AON_WRAPPER_MVP_NOC_LPI_CONTROL failed\n", __func__); d_vpr_e("%s: AON_WRAPPER_MVP_NOC_LPI_CONTROL failed\n", __func__);
rc = __write_register_masked(core, AON_WRAPPER_MVP_NOC_LPI_CONTROL, rc = __write_register_masked(core, AON_WRAPPER_MVP_NOC_LPI_CONTROL,
0x0, BIT(0)); 0x0, BIT(0));