In existing implementation, driver is freeing and un-mapping all the
decoded picture buffers(DPB) as part of dynamic resolution change(DRC)
handling. As a result, when firmware try to access the DPB buffer, from
previous sequence, SMMU context fault is seen due to the buffer being
already unmapped.
With this change, driver defines ownership of each DPB buffer. If a buffer
is owned by firmware, driver would skip from un-mapping the same.
Signed-off-by: Mansur Alisha Shaik <[email protected]>
---
drivers/media/platform/qcom/venus/core.h | 3 +++
drivers/media/platform/qcom/venus/helpers.c | 37 ++++++++++++++++++++++-------
drivers/media/platform/qcom/venus/helpers.h | 17 +++++++++++++
drivers/media/platform/qcom/venus/vdec.c | 25 ++++++++++++++++++-
4 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 8df2d49..7ecbf9e 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -450,6 +450,7 @@ struct venus_inst {
bool next_buf_last;
bool drain_active;
enum venus_inst_modes flags;
+ u32 dpb_out_tag[VB2_MAX_FRAME];
};
#define IS_V1(core) ((core)->res->hfi_version == HFI_VERSION_1XX)
@@ -484,4 +485,6 @@ venus_caps_by_codec(struct venus_core *core, u32 codec, u32 domain)
return NULL;
}
+void dpb_out_tag_init(struct venus_inst *inst);
+
#endif
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 1fe6d46..ee2e26a 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -21,14 +21,6 @@
#define NUM_MBS_720P (((1280 + 15) >> 4) * ((720 + 15) >> 4))
#define NUM_MBS_4K (((4096 + 15) >> 4) * ((2304 + 15) >> 4))
-struct intbuf {
- struct list_head list;
- u32 type;
- size_t size;
- void *va;
- dma_addr_t da;
- unsigned long attrs;
-};
bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt)
{
@@ -95,9 +87,16 @@ int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
fdata.device_addr = buf->da;
fdata.buffer_type = buf->type;
+ if (buf->owned_by == FIRMWARE)
+ continue;
+
+ fdata.clnt_data = buf->dpb_out_tag;
+
ret = hfi_session_process_buf(inst, &fdata);
if (ret)
goto fail;
+
+ buf->owned_by = FIRMWARE;
}
fail:
@@ -110,18 +109,36 @@ int venus_helper_free_dpb_bufs(struct venus_inst *inst)
struct intbuf *buf, *n;
list_for_each_entry_safe(buf, n, &inst->dpbbufs, list) {
+ if (buf->owned_by == FIRMWARE)
+ continue;
+
+ inst->dpb_out_tag[buf->dpb_out_tag - VB2_MAX_FRAME] = 0;
+
list_del_init(&buf->list);
dma_free_attrs(inst->core->dev, buf->size, buf->va, buf->da,
buf->attrs);
kfree(buf);
}
- INIT_LIST_HEAD(&inst->dpbbufs);
return 0;
}
EXPORT_SYMBOL_GPL(venus_helper_free_dpb_bufs);
+int venus_helper_get_free_dpb_tag(struct venus_inst *inst)
+{
+ u32 i;
+
+ for (i = 0; i < VB2_MAX_FRAME; i++) {
+ if (inst->dpb_out_tag[i] == 0) {
+ inst->dpb_out_tag[i] = i + VB2_MAX_FRAME;
+ return inst->dpb_out_tag[i];
+ }
+ }
+
+ return 0;
+}
+
int venus_helper_alloc_dpb_bufs(struct venus_inst *inst)
{
struct venus_core *core = inst->core;
@@ -171,6 +188,8 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst)
ret = -ENOMEM;
goto fail;
}
+ buf->owned_by = DRIVER;
+ buf->dpb_out_tag = venus_helper_get_free_dpb_tag(inst);
list_add_tail(&buf->list, &inst->dpbbufs);
}
diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
index e6269b4..e6ff556 100644
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h
@@ -8,6 +8,22 @@
#include <media/videobuf2-v4l2.h>
+enum dpb_buf_owner {
+ DRIVER,
+ FIRMWARE,
+};
+
+struct intbuf {
+ struct list_head list;
+ u32 type;
+ size_t size;
+ void *va;
+ dma_addr_t da;
+ unsigned long attrs;
+ enum dpb_buf_owner owned_by;
+ u32 dpb_out_tag;
+};
+
struct venus_inst;
struct venus_core;
@@ -66,4 +82,5 @@ int venus_helper_get_profile_level(struct venus_inst *inst, u32 *profile, u32 *l
int venus_helper_set_profile_level(struct venus_inst *inst, u32 profile, u32 level);
int venus_helper_set_stride(struct venus_inst *inst, unsigned int aligned_width,
unsigned int aligned_height);
+
#endif
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 198e47e..ba46085 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1297,6 +1297,7 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type,
struct vb2_v4l2_buffer *vbuf;
struct vb2_buffer *vb;
unsigned int type;
+ struct intbuf *dpb_buf;
vdec_pm_touch(inst);
@@ -1306,8 +1307,18 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type,
type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
vbuf = venus_helper_find_buf(inst, type, tag);
- if (!vbuf)
+ if (!vbuf) {
+ if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
+ buf_type == HFI_BUFFER_OUTPUT) {
+ list_for_each_entry(dpb_buf, &inst->dpbbufs, list) {
+ if (dpb_buf->dpb_out_tag == tag) {
+ dpb_buf->owned_by = DRIVER;
+ break;
+ }
+ }
+ }
return;
+ }
vbuf->flags = flags;
vbuf->field = V4L2_FIELD_NONE;
@@ -1542,6 +1553,14 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
return vb2_queue_init(dst_vq);
}
+void dpb_out_tag_init(struct venus_inst *inst)
+{
+ u32 i;
+
+ for (i = 0; i < VB2_MAX_FRAME; i++)
+ inst->dpb_out_tag[i] = 0;
+}
+
static int vdec_open(struct file *file)
{
struct venus_core *core = video_drvdata(file);
@@ -1580,6 +1599,8 @@ static int vdec_open(struct file *file)
vdec_inst_init(inst);
+ dpb_out_tag_init(inst);
+
/*
* create m2m device for every instance, the m2m context scheduling
* is made by firmware side so we do not need to care about.
@@ -1622,6 +1643,8 @@ static int vdec_close(struct file *file)
vdec_pm_get(inst);
+ venus_helper_free_dpb_bufs(inst);
+ INIT_LIST_HEAD(&inst->dpbbufs);
v4l2_m2m_ctx_release(inst->m2m_ctx);
v4l2_m2m_release(inst->m2m_dev);
vdec_ctrl_deinit(inst);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Hi Mansur,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v5.14-rc1 next-20210713]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Mansur-Alisha-Shaik/venus-vdec-decoded-picture-buffer-handling-during-reconfig-sequence/20210713-205958
base: git://linuxtv.org/media_tree.git master
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/971381185ff2025c3cda25145ba6dcd1702fdaeb
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Mansur-Alisha-Shaik/venus-vdec-decoded-picture-buffer-handling-during-reconfig-sequence/20210713-205958
git checkout 971381185ff2025c3cda25145ba6dcd1702fdaeb
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> drivers/media/platform/qcom/venus/helpers.c:128:5: warning: no previous prototype for 'venus_helper_get_free_dpb_tag' [-Wmissing-prototypes]
128 | int venus_helper_get_free_dpb_tag(struct venus_inst *inst)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/venus_helper_get_free_dpb_tag +128 drivers/media/platform/qcom/venus/helpers.c
127
> 128 int venus_helper_get_free_dpb_tag(struct venus_inst *inst)
129 {
130 u32 i;
131
132 for (i = 0; i < VB2_MAX_FRAME; i++) {
133 if (inst->dpb_out_tag[i] == 0) {
134 inst->dpb_out_tag[i] = i + VB2_MAX_FRAME;
135 return inst->dpb_out_tag[i];
136 }
137 }
138
139 return 0;
140 }
141
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]