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

video: rockchip: mpp: Fix JPEG dma coherence issue

Browse Source 
MPP userspace drive will write JPEG header before encoder working, so
these data may remain at cache and flushed after hardware writing
encoded datad. And some data at the boundary may be corrupt.

Change-Id: I7f721293714fff68e6d07578ceb99a12454d488d
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
This commit is contained in:
Johnson Ding
2022-04-07 15:36:01 +08:00
committed by Tao Huang
parent d6b0925fc8
commit 30e3070cc2
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/video/rockchip/mpp/mpp_vepu2.c
View File

@@ -36,6 +36,8 @@
#define VEPU2_REG_HW_ID_INDEX -1 /* INVALID */
#define VEPU2_REG_START_INDEX 0
#define VEPU2_REG_END_INDEX 183
#define VEPU2_REG_OUT_INDEX (77)
#define VEPU2_REG_STRM_INDEX (53)
#define VEPU2_REG_ENC_EN 0x19c
#define VEPU2_REG_ENC_EN_INDEX (103)
@@ -97,6 +99,8 @@ struct vepu_task {
u32 width;
u32 height;
u32 pixels;
struct dma_buf *dmabuf_bs;
u32 offset_bs;
};
struct vepu_session_priv {
@@ -179,8 +183,14 @@ static int vepu_process_reg_fd(struct mpp_session *session,
struct mpp_task_msgs *msgs)
{
int ret;
int fd_bs;
int fmt = VEPU2_GET_FORMAT(task->reg[VEPU2_REG_ENC_EN_INDEX]);
if (session->msg_flags & MPP_FLAGS_REG_NO_OFFSET)
fd_bs = task->reg[VEPU2_REG_OUT_INDEX];
else
fd_bs = task->reg[VEPU2_REG_OUT_INDEX] & 0x3ff;
ret = mpp_translate_reg_address(session, &task->mpp_task,
fmt, task->reg, &task->off_inf);
if (ret)
@@ -189,6 +199,19 @@ static int vepu_process_reg_fd(struct mpp_session *session,
mpp_translate_reg_offset_info(&task->mpp_task,
&task->off_inf, task->reg);
if (fmt == VEPU2_FMT_JPEGE) {
task->offset_bs = mpp_query_reg_offset_info(&task->off_inf, VEPU2_REG_OUT_INDEX);
if (task->offset_bs > 0)
task->dmabuf_bs = dma_buf_get(fd_bs);
if (IS_ERR_OR_NULL(task->dmabuf_bs))
task->dmabuf_bs = NULL;
else
dma_buf_end_cpu_access_partial(task->dmabuf_bs, DMA_TO_DEVICE, 0,
task->offset_bs);
}
return 0;
}
@@ -458,6 +481,11 @@ static int vepu_result(struct mpp_dev *mpp,
}
}
if (task->dmabuf_bs)
dma_buf_begin_cpu_access_partial(task->dmabuf_bs, DMA_FROM_DEVICE, 0,
task->reg[VEPU2_REG_STRM_INDEX] / 8 +
task->offset_bs);
return 0;
}
@@ -466,6 +494,12 @@ static int vepu_free_task(struct mpp_session *session,
{
struct vepu_task *task = to_vepu_task(mpp_task);
if (task->dmabuf_bs) {
dma_buf_put(task->dmabuf_bs);
task->dmabuf_bs = NULL;
task->offset_bs = 0;
}
mpp_task_finalize(session, mpp_task);
kfree(task);