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_mm.c | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 deletions(-)
diff --git a/kernel/drivers/video/rockchip/rga3/rga_mm.c b/kernel/drivers/video/rockchip/rga3/rga_mm.c
index d261833..de7e9a6 100644
--- a/kernel/drivers/video/rockchip/rga3/rga_mm.c
+++ b/kernel/drivers/video/rockchip/rga3/rga_mm.c
@@ -455,6 +455,7 @@
phys_addr = sg_phys(buffer->sgt->sgl);
if (phys_addr == 0) {
pr_err("%s get physical address error!", __func__);
+ ret = -EFAULT;
goto unmap_buffer;
}
@@ -571,6 +572,7 @@
phys_addr = sg_phys(sgt->sgl);
if (phys_addr == 0) {
pr_err("%s get physical address error!", __func__);
+ ret = -EFAULT;
goto free_sgt;
}
@@ -621,8 +623,9 @@
if (mm_flag & RGA_MEM_PHYSICAL_CONTIGUOUS)
break;
- pr_err("Current %s[%d] cannot support virtual address!\n",
+ pr_err("Current %s[%d] cannot support physically discontinuous virtual address!\n",
rga_get_mmu_type_str(scheduler->data->mmu), scheduler->data->mmu);
+ ret = -EOPNOTSUPP;
goto free_dma_buffer;
}
@@ -840,9 +843,15 @@
return 0;
}
+static void rga_mm_buffer_destroy(struct rga_internal_buffer *buffer)
+{
+ rga_mm_kref_release_buffer(&buffer->refcount);
+}
+
static struct rga_internal_buffer *
rga_mm_lookup_external(struct rga_mm *mm_session,
- struct rga_external_buffer *external_buffer)
+ struct rga_external_buffer *external_buffer,
+ struct mm_struct *current_mm)
{
int id;
struct dma_buf *dma_buf = NULL;
@@ -875,8 +884,12 @@
continue;
if (temp_buffer->virt_addr->addr == external_buffer->memory) {
- output_buffer = temp_buffer;
- break;
+ if (temp_buffer->current_mm == current_mm) {
+ output_buffer = temp_buffer;
+ break;
+ }
+
+ continue;
}
}
@@ -1309,7 +1322,8 @@
return -EFAULT;
}
- if (buffer->mm_flag & RGA_MEM_PHYSICAL_CONTIGUOUS) {
+ if (buffer->mm_flag & RGA_MEM_PHYSICAL_CONTIGUOUS &&
+ scheduler->data->mmu != RGA_IOMMU) {
dma_sync_single_for_device(scheduler->dev, buffer->phys_addr, buffer->size, dir);
} else {
sgt = rga_mm_lookup_sgt(buffer);
@@ -1339,7 +1353,8 @@
return -EFAULT;
}
- if (buffer->mm_flag & RGA_MEM_PHYSICAL_CONTIGUOUS) {
+ if (buffer->mm_flag & RGA_MEM_PHYSICAL_CONTIGUOUS &&
+ scheduler->data->mmu != RGA_IOMMU) {
dma_sync_single_for_cpu(scheduler->dev, buffer->phys_addr, buffer->size, dir);
} else {
sgt = rga_mm_lookup_sgt(buffer);
@@ -1481,6 +1496,11 @@
if (internal_buffer->mm_flag & RGA_MEM_FORCE_FLUSH_CACHE && dir != DMA_NONE)
if (rga_mm_sync_dma_sg_for_cpu(internal_buffer, job, dir))
pr_err("sync sgt for cpu error!\n");
+
+ if (DEBUGGER_EN(MM)) {
+ pr_info("handle[%d] put info:\n", (int)internal_buffer->handle);
+ rga_mm_dump_buffer(internal_buffer);
+ }
mutex_lock(&mm->lock);
kref_put(&internal_buffer->refcount, rga_mm_kref_release_buffer);
@@ -1981,6 +2001,7 @@
int rga_mm_map_job_info(struct rga_job *job)
{
int ret;
+ ktime_t timestamp = ktime_get();
if (job->flags & RGA_JOB_USE_HANDLE) {
ret = rga_mm_get_handle_info(job);
@@ -1988,12 +2009,20 @@
pr_err("failed to get buffer from handle\n");
return ret;
}
+
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], get buffer_handle info cost %lld us\n",
+ job->request_id, ktime_us_delta(ktime_get(), timestamp));
} else {
ret = rga_mm_map_buffer_info(job);
if (ret < 0) {
pr_err("failed to map buffer\n");
return ret;
}
+
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], map buffer cost %lld us\n",
+ job->request_id, ktime_us_delta(ktime_get(), timestamp));
}
return 0;
@@ -2001,14 +2030,35 @@
void rga_mm_unmap_job_info(struct rga_job *job)
{
- if (job->flags & RGA_JOB_USE_HANDLE)
+ ktime_t timestamp = ktime_get();
+
+ if (job->flags & RGA_JOB_USE_HANDLE) {
rga_mm_put_handle_info(job);
- else
+
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], put buffer_handle info cost %lld us\n",
+ job->request_id, ktime_us_delta(ktime_get(), timestamp));
+ } else {
rga_mm_unmap_buffer_info(job);
+
+ if (DEBUGGER_EN(TIME))
+ pr_info("request[%d], unmap buffer cost %lld us\n",
+ job->request_id, ktime_us_delta(ktime_get(), timestamp));
+ }
}
-uint32_t rga_mm_import_buffer(struct rga_external_buffer *external_buffer,
- struct rga_session *session)
+/*
+ * rga_mm_import_buffer - Importing external buffer into the RGA driver
+ *
+ * @external_buffer: [in] Parameters of external buffer
+ * @session: [in] Session of the current process
+ *
+ * returns:
+ * if return value > 0, the buffer import is successful and is the generated
+ * buffer-handle, negative error code on failure.
+ */
+int rga_mm_import_buffer(struct rga_external_buffer *external_buffer,
+ struct rga_session *session)
{
int ret = 0, new_id;
struct rga_mm *mm;
@@ -2017,17 +2067,23 @@
mm = rga_drvdata->mm;
if (mm == NULL) {
pr_err("rga mm is null!\n");
- return 0;
+ return -EFAULT;
}
mutex_lock(&mm->lock);
/* first, Check whether to rga_mm */
- internal_buffer = rga_mm_lookup_external(mm, external_buffer);
+ internal_buffer = rga_mm_lookup_external(mm, external_buffer, current->mm);
if (!IS_ERR_OR_NULL(internal_buffer)) {
kref_get(&internal_buffer->refcount);
mutex_unlock(&mm->lock);
+
+ if (DEBUGGER_EN(MM)) {
+ pr_info("import existing buffer:\n");
+ rga_mm_dump_buffer(internal_buffer);
+ }
+
return internal_buffer->handle;
}
@@ -2037,7 +2093,7 @@
pr_err("%s alloc internal_buffer error!\n", __func__);
mutex_unlock(&mm->lock);
- return 0;
+ return -ENOMEM;
}
ret = rga_mm_map_buffer(external_buffer, internal_buffer, NULL, true);
@@ -2056,6 +2112,7 @@
idr_preload_end();
if (new_id < 0) {
pr_err("internal_buffer alloc id failed!\n");
+ ret = new_id;
goto FREE_INTERNAL_BUFFER;
}
@@ -2074,7 +2131,7 @@
mutex_unlock(&mm->lock);
kfree(internal_buffer);
- return 0;
+ return ret;
}
int rga_mm_release_buffer(uint32_t handle)
@@ -2126,9 +2183,9 @@
idr_for_each_entry(&mm->memory_idr, buffer, i) {
if (session == buffer->session) {
- pr_err("[tgid:%d] Decrement the reference of handle[%d] when the user exits\n",
+ pr_err("[tgid:%d] Destroy handle[%d] when the user exits\n",
session->tgid, buffer->handle);
- kref_put(&buffer->refcount, rga_mm_kref_release_buffer);
+ rga_mm_buffer_destroy(buffer);
}
}
--
Gitblit v1.6.2