From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/video/rockchip/rga3/rga_job.c | 124 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 35 deletions(-)
diff --git a/kernel/drivers/video/rockchip/rga3/rga_job.c b/kernel/drivers/video/rockchip/rga3/rga_job.c
index 647fc2b..fae613b 100644
--- a/kernel/drivers/video/rockchip/rga3/rga_job.c
+++ b/kernel/drivers/video/rockchip/rga3/rga_job.c
@@ -13,6 +13,7 @@
#include "rga_mm.h"
#include "rga_iommu.h"
#include "rga_debugger.h"
+#include "rga_common.h"
static void rga_job_free(struct rga_job *job)
{
@@ -40,11 +41,12 @@
static int rga_job_cleanup(struct rga_job *job)
{
- if (DEBUGGER_EN(TIME))
- pr_err("(pid:%d) job clean use time = %lld\n", job->pid,
- ktime_us_delta(ktime_get(), job->timestamp));
-
rga_job_put(job);
+
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], job cleanup total cost time %lld us\n",
+ job->request_id,
+ ktime_us_delta(ktime_get(), job->timestamp));
return 0;
}
@@ -272,11 +274,11 @@
if (DEBUGGER_EN(DUMP_IMAGE))
rga_dump_job_image(job);
- if (DEBUGGER_EN(TIME)) {
- pr_info("hw use time = %lld\n", ktime_us_delta(now, job->hw_running_time));
- pr_info("(pid:%d) job done use time = %lld\n", job->pid,
- ktime_us_delta(now, job->timestamp));
- }
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], hardware[%s] cost time %lld us\n",
+ job->request_id,
+ rga_get_core_name(scheduler->core),
+ ktime_us_delta(now, job->hw_running_time));
rga_mm_unmap_job_info(job);
@@ -492,7 +494,7 @@
return false;
}
-static int rga_request_get_current_mm(struct rga_request *request)
+static struct mm_struct *rga_request_get_current_mm(struct rga_request *request)
{
int i;
@@ -500,23 +502,21 @@
if (rga_is_need_current_mm(&(request->task_list[i]))) {
mmgrab(current->mm);
mmget(current->mm);
- request->current_mm = current->mm;
- break;
+ return current->mm;
}
}
- return 0;
+ return NULL;
}
-static void rga_request_put_current_mm(struct rga_request *request)
+static void rga_request_put_current_mm(struct mm_struct *mm)
{
- if (request->current_mm == NULL)
+ if (mm == NULL)
return;
- mmput(request->current_mm);
- mmdrop(request->current_mm);
- request->current_mm = NULL;
+ mmput(mm);
+ mmdrop(mm);
}
static int rga_request_add_acquire_fence_callback(int acquire_fence_fd,
@@ -693,6 +693,7 @@
static void rga_request_release_abort(struct rga_request *request, int err_code)
{
unsigned long flags;
+ struct mm_struct *current_mm;
struct rga_pending_request_manager *request_manager = rga_drvdata->pend_request_manager;
if (rga_request_scheduler_job_abort(request) > 0)
@@ -707,10 +708,12 @@
request->is_running = false;
request->is_done = false;
-
- rga_request_put_current_mm(request);
+ current_mm = request->current_mm;
+ request->current_mm = NULL;
spin_unlock_irqrestore(&request->lock, flags);
+
+ rga_request_put_current_mm(current_mm);
rga_dma_fence_signal(request->release_fence, err_code);
@@ -820,7 +823,14 @@
struct rga_job *job;
for (i = 0; i < request->task_count; i++) {
- job = rga_job_commit(&(request->task_list[i]), request);
+ struct rga_req *req = &(request->task_list[i]);
+
+ if (DEBUGGER_EN(MSG)) {
+ pr_info("commit request[%d] task[%d]:\n", request->id, i);
+ rga_cmd_print_debug_info(req);
+ }
+
+ job = rga_job_commit(req, request);
if (IS_ERR(job)) {
pr_err("request[%d] task[%d] job_commit failed.\n", request->id, i);
rga_request_release_abort(request, PTR_ERR(job));
@@ -841,12 +851,34 @@
static void rga_request_acquire_fence_signaled_cb(struct dma_fence *fence,
struct dma_fence_cb *_waiter)
{
+ int ret;
+ unsigned long flags;
+ struct mm_struct *current_mm;
struct rga_fence_waiter *waiter = (struct rga_fence_waiter *)_waiter;
struct rga_request *request = (struct rga_request *)waiter->private;
struct rga_pending_request_manager *request_manager = rga_drvdata->pend_request_manager;
- if (rga_request_commit(request))
- pr_err("rga request[%d] commit failed!\n", request->id);
+ ret = rga_request_commit(request);
+ if (ret < 0) {
+ pr_err("acquire_fence callback: rga request[%d] commit failed!\n", request->id);
+
+ spin_lock_irqsave(&request->lock, flags);
+
+ request->is_running = false;
+ current_mm = request->current_mm;
+ request->current_mm = NULL;
+
+ spin_unlock_irqrestore(&request->lock, flags);
+
+ rga_request_put_current_mm(current_mm);
+
+ /*
+ * Since the callback is called while holding &dma_fence.lock,
+ * the _locked API is used here.
+ */
+ if (dma_fence_get_status_locked(request->release_fence) == 0)
+ dma_fence_signal_locked(request->release_fence);
+ }
mutex_lock(&request_manager->lock);
rga_request_put(request);
@@ -859,6 +891,7 @@
{
struct rga_pending_request_manager *request_manager;
struct rga_request *request;
+ struct mm_struct *current_mm;
int finished_count, failed_count;
bool is_finished = false;
unsigned long flags;
@@ -895,17 +928,17 @@
spin_unlock_irqrestore(&request->lock, flags);
- rga_job_cleanup(job);
-
if ((failed_count + finished_count) >= request->task_count) {
spin_lock_irqsave(&request->lock, flags);
request->is_running = false;
request->is_done = true;
-
- rga_request_put_current_mm(request);
+ current_mm = request->current_mm;
+ request->current_mm = NULL;
spin_unlock_irqrestore(&request->lock, flags);
+
+ rga_request_put_current_mm(current_mm);
rga_dma_fence_signal(request->release_fence, request->ret);
@@ -929,6 +962,13 @@
rga_request_put(request);
mutex_unlock(&request_manager->lock);
+
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], job done total cost time %lld us\n",
+ job->request_id,
+ ktime_us_delta(ktime_get(), job->timestamp));
+
+ rga_job_cleanup(job);
return 0;
}
@@ -1059,6 +1099,9 @@
int ret = 0;
unsigned long flags;
struct dma_fence *release_fence;
+ struct mm_struct *current_mm;
+
+ current_mm = rga_request_get_current_mm(request);
spin_lock_irqsave(&request->lock, flags);
@@ -1066,14 +1109,16 @@
spin_unlock_irqrestore(&request->lock, flags);
pr_err("can not re-config when request is running\n");
- return -EFAULT;
+ ret = -EFAULT;
+ goto err_put_current_mm;
}
if (request->task_list == NULL) {
spin_unlock_irqrestore(&request->lock, flags);
pr_err("can not find task list from id[%d]\n", request->id);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_put_current_mm;
}
/* Reset */
@@ -1081,8 +1126,7 @@
request->is_done = false;
request->finished_task_count = 0;
request->failed_task_count = 0;
-
- rga_request_get_current_mm(request);
+ request->current_mm = current_mm;
/* Unlock after ensuring that the current request will not be resubmitted. */
spin_unlock_irqrestore(&request->lock, flags);
@@ -1092,7 +1136,7 @@
if (IS_ERR(release_fence)) {
pr_err("Can not alloc release fence!\n");
ret = IS_ERR(release_fence);
- goto error_put_current_mm;
+ goto err_reset_request;
}
request->release_fence = release_fence;
@@ -1141,13 +1185,16 @@
request->release_fence = NULL;
}
-error_put_current_mm:
+err_reset_request:
spin_lock_irqsave(&request->lock, flags);
- rga_request_put_current_mm(request);
+ request->current_mm = NULL;
request->is_running = false;
spin_unlock_irqrestore(&request->lock, flags);
+
+err_put_current_mm:
+ rga_request_put_current_mm(current_mm);
return ret;
}
@@ -1237,6 +1284,7 @@
static void rga_request_kref_release(struct kref *ref)
{
struct rga_request *request;
+ struct mm_struct *current_mm;
unsigned long flags;
request = container_of(ref, struct rga_request, refcount);
@@ -1246,16 +1294,22 @@
spin_lock_irqsave(&request->lock, flags);
- rga_request_put_current_mm(request);
rga_dma_fence_put(request->release_fence);
+ current_mm = request->current_mm;
+ request->current_mm = NULL;
if (!request->is_running || request->is_done) {
spin_unlock_irqrestore(&request->lock, flags);
+
+ rga_request_put_current_mm(current_mm);
+
goto free_request;
}
spin_unlock_irqrestore(&request->lock, flags);
+ rga_request_put_current_mm(current_mm);
+
rga_request_scheduler_job_abort(request);
free_request:
--
Gitblit v1.6.2