qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: rockchip: rga3: fix timeout not returning error code 

Update driver version to 1.2.25

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I718ccbbe3512de3194b5a5b4da549971b3999d14
This commit is contained in:
Yu Qiaowei 2023-02-23 11:37:53 +08:00 committed by Tao Huang
parent bfcf44d74a
commit d1e360f3b0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/rockchip/rga3/include/rga_drv.h
View File

@ -87,7 +87,7 @@
#define DRIVER_MAJOR_VERISON 1
#define DRIVER_MINOR_VERSION 2
#define DRIVER_REVISION_VERSION 24
#define DRIVER_REVISION_VERSION 25
#define DRIVER_PATCH_VERSION
#define DRIVER_VERSION (STR(DRIVER_MAJOR_VERISON) "." STR(DRIVER_MINOR_VERSION) \

6
drivers/video/rockchip/rga3/rga_job.c
View File

@ -746,16 +746,16 @@ static int rga_request_timeout_query_state(struct rga_request *request)
if (scheduler->running_job) {
job = scheduler->running_job;
if (request->id == job->request_id) {
if (test_bit(RGA_JOB_DONE, &job->state) &&
if (test_bit(RGA_JOB_STATE_DONE, &job->state) &&
test_bit(RGA_JOB_STATE_FINISH, &job->state)) {
spin_unlock_irqrestore(&scheduler->irq_lock, flags);
return request->ret;
} else if (!test_bit(RGA_JOB_DONE, &job->state) &&
} else if (!test_bit(RGA_JOB_STATE_DONE, &job->state) &&
test_bit(RGA_JOB_STATE_FINISH, &job->state)) {
spin_unlock_irqrestore(&scheduler->irq_lock, flags);
pr_err("hardware has finished, but the software has timeout!\n");
return -EBUSY;
} else if (!test_bit(RGA_JOB_DONE, &job->state) &&
} else if (!test_bit(RGA_JOB_STATE_DONE, &job->state) &&
!test_bit(RGA_JOB_STATE_FINISH, &job->state)) {
spin_unlock_irqrestore(&scheduler->irq_lock, flags);
pr_err("hardware has timeout.\n");