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

video: rockchip: mpp: fix failed to enable jpegd issue

Browse Source 
Failed to enable jpeg dec hw when the soft-reset of
the previous frame has not been completed.
So we have to manually trigger to do soft-reset when checking
that the soft-reset of this frame is not completed

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ib4cbb3c8a42af9d7235bcf41194f5b9ea7c9e207
This commit is contained in:
Yandong Lin
2021-08-04 10:02:49 +08:00
committed by Tao Huang
parent 584adb9822
commit d61acc2e76
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/video/rockchip/mpp/mpp_jpgdec.c
View File

@@ -58,6 +58,9 @@
#define JPGDEC_IRQ_DIS BIT(1)
#define JPGDEC_START_EN BIT(0)
#define JPGDEC_REG_SYS_BASE 0x008
#define JPGDEC_FORCE_SOFTRESET_VALID BIT(17)
#define JPGDEC_REG_PIC_INFO_BASE 0x00c
#define JPGDEC_REG_PIC_INFO_INDEX (3)
#define JPGDEC_GET_WIDTH(x) (((x) & 0xffff) + 1)
@@ -234,6 +237,14 @@ fail:
return NULL;
}
static int jpgdec_soft_reset(struct mpp_dev *mpp)
{
mpp_write(mpp, JPGDEC_REG_SYS_BASE, JPGDEC_FORCE_SOFTRESET_VALID);
mpp_write(mpp, JPGDEC_REG_INT_EN_BASE, JPGDEC_SOFT_REST_EN);
return 0;
}
static int jpgdec_run(struct mpp_dev *mpp,
struct mpp_task *mpp_task)
{
@@ -289,6 +300,15 @@ static int jpgdec_finish(struct mpp_dev *mpp,
dec_get = mpp_read_relaxed(mpp, JPGDEC_REG_STREAM_RLC_BASE);
dec_length = dec_get - task->strm_addr;
task->reg[JPGDEC_REG_STREAM_RLC_BASE_INDEX] = dec_length << 10;
/*
* If the softrest_rdy bit is low,
* it means that the soft-reset of the previous frame
* has not been completed.We have to manually trigger to do soft-reset.
*/
if (!(task->irq_status & JPGDEC_SOFT_RSET_READY) &&
!atomic_read(&mpp->reset_request))
jpgdec_soft_reset(mpp);
mpp_debug(DEBUG_REGISTER,
"dec_get %08x dec_length %d\n", dec_get, dec_length);