shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

driver: rknpu: Ignore devfreq init return value even if it failed

Browse Source 
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I30e38acaf0af9e40a211bfcc2c71aecfffc533f5
This commit is contained in:
Felix Zeng
2022-08-29 14:35:46 +08:00
committed by Tao Huang
parent 39c3a52c25
commit 5f657024c2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rknpu/include/rknpu_drv.h
View File

@@ -30,7 +30,7 @@
#define DRIVER_NAME "rknpu"
#define DRIVER_DESC "RKNPU driver"
#define DRIVER_DATE "20220826"
#define DRIVER_DATE "20220829"
#define DRIVER_MAJOR 0
#define DRIVER_MINOR 8
#define DRIVER_PATCHLEVEL 2

9
drivers/rknpu/rknpu_drv.c
View File

@@ -1186,7 +1186,7 @@ static int rknpu_devfreq_init(struct rknpu_device *rknpu_dev)
opp = devfreq_recommended_opp(dev, &rknpu_dev->current_freq, 0);
if (IS_ERR(opp)) {
ret = PTR_ERR(opp);
return ret;
goto err_remove_table;
}
dev_pm_opp_put(opp);
dp->initial_freq = rknpu_dev->current_freq;
@@ -1313,7 +1313,6 @@ static int rknpu_devfreq_init(struct rknpu_device *rknpu_dev)
int ret = -EINVAL;
ret = rockchip_init_opp_table(dev, NULL, "npu_leakage", "rknpu");
if (ret) {
LOG_DEV_ERROR(dev, "failed to init_opp_table\n");
return ret;
@@ -1322,7 +1321,7 @@ static int rknpu_devfreq_init(struct rknpu_device *rknpu_dev)
ret = npu_devfreq_adjust_current_freq_volt(dev, rknpu_dev);
if (ret) {
LOG_DEV_ERROR(dev, "failed to adjust current freq volt\n");
return ret;
goto err_remove_table;
}
dp->initial_freq = rknpu_dev->current_freq;
@@ -1706,9 +1705,7 @@ static int rknpu_probe(struct platform_device *pdev)
goto err_remove_drv;
#ifndef FPGA_PLATFORM
ret = rknpu_devfreq_init(rknpu_dev);
if (ret)
goto err_remove_drv;
rknpu_devfreq_init(rknpu_dev);
#endif
// set default power put delay to 3s