mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
MALI: bifrost: not to call kbase_ipa_init() if rockchip simple-power-model is used
To avoid warning logs: [ 4.268726] mali fb000000.gpu: Couldn't find power_model DT node matching 'arm,mali-simple-power-model' [ 4.268737] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.static-coefficient = 1*[0] [ 4.268899] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.dynamic-coefficient = 1*[0] [ 4.269057] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.ts = 4*[0] [ 4.269222] mali fb000000.gpu: Error -22, no DT entry: mali-simple-power-model.thermal-zone = '' Change-Id: I4f7248c0847b0f161ad2fb04b4ce5a7c6777a770 Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
This commit is contained in:
@@ -729,15 +729,6 @@ int kbase_devfreq_init(struct kbase_device *kbdev)
|
||||
kbdev->gpu_props.props.core_props.gpu_freq_khz_max =
|
||||
dp->freq_table[0] / 1000;
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL)
|
||||
err = kbase_ipa_init(kbdev);
|
||||
if (err) {
|
||||
dev_err(kbdev->dev, "IPA initialization failed");
|
||||
goto ipa_init_failed;
|
||||
}
|
||||
#endif
|
||||
|
||||
err = kbase_devfreq_init_core_mask_table(kbdev);
|
||||
if (err)
|
||||
goto init_core_mask_table_failed;
|
||||
@@ -824,6 +815,12 @@ int kbase_devfreq_init(struct kbase_device *kbdev)
|
||||
goto ipa_init_failed;
|
||||
}
|
||||
} else {
|
||||
err = kbase_ipa_init(kbdev);
|
||||
if (err) {
|
||||
dev_err(kbdev->dev, "IPA initialization failed\n");
|
||||
goto ipa_init_failed;
|
||||
}
|
||||
|
||||
kbdev->devfreq_cooling = of_devfreq_cooling_register_power(
|
||||
kbdev->dev->of_node,
|
||||
kbdev->devfreq,
|
||||
@@ -842,6 +839,8 @@ int kbase_devfreq_init(struct kbase_device *kbdev)
|
||||
|
||||
#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL)
|
||||
cooling_reg_failed:
|
||||
kbase_ipa_term(kbdev);
|
||||
ipa_init_failed:
|
||||
devfreq_unregister_opp_notifier(kbdev->dev, kbdev->devfreq);
|
||||
#endif /* CONFIG_DEVFREQ_THERMAL */
|
||||
|
||||
@@ -858,10 +857,6 @@ devfreq_add_dev_failed:
|
||||
kbase_devfreq_term_core_mask_table(kbdev);
|
||||
|
||||
init_core_mask_table_failed:
|
||||
#if IS_ENABLED(CONFIG_DEVFREQ_THERMAL)
|
||||
kbase_ipa_term(kbdev);
|
||||
ipa_init_failed:
|
||||
#endif
|
||||
if (free_devfreq_freq_table)
|
||||
kbase_devfreq_term_freq_table(kbdev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user