summaryrefslogtreecommitdiff
path: root/drivers/mxc
diff options
context:
space:
mode:
authorShijie Qin <shijie.qin@nxp.com>2020-01-22 10:28:04 +0800
committerShijie Qin <shijie.qin@nxp.com>2020-01-22 14:50:42 +0800
commit7d04b6ad2706f571adae7308b344186b38e16d17 (patch)
treeb80d377b1c49eb40bd93e9ccdd2ae97cfc8069a4 /drivers/mxc
parentc6db5ca1ee29a1c4333d8b4c50cb1fe1fe2c77c9 (diff)
MLK-23263 mxc: vpu_malone: correct vpu decoder used bits of fuse
Malone decoder used bits of fuse are 14-15 bits Signed-off-by: Shijie Qin <shijie.qin@nxp.com> Reviewed-by: ming_qian <ming.qian@nxp.com> (cherry picked from commit 8d34c1d1ce31048316da88448f8eecbed885fc44)
Diffstat (limited to 'drivers/mxc')
-rw-r--r--drivers/mxc/vpu_malone/vpu_b0.h2
-rw-r--r--drivers/mxc/vpu_malone/vpu_mu.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mxc/vpu_malone/vpu_b0.h b/drivers/mxc/vpu_malone/vpu_b0.h
index 8feaf498cf6a..e1e0949e5237 100644
--- a/drivers/mxc/vpu_malone/vpu_b0.h
+++ b/drivers/mxc/vpu_malone/vpu_b0.h
@@ -508,6 +508,8 @@ struct vpu_ctx {
#define V4L2_NXP_FRAME_VERTICAL_ALIGN 512
#define V4L2_NXP_FRAME_HORIZONTAL_ALIGN 512
+#define VPU_IMX_DECODER_FUSE_OFFSET 14
+
pSTREAM_BUFFER_DESCRIPTOR_TYPE get_str_buffer_desc(struct vpu_ctx *ctx);
u_int32 got_free_space(u_int32 wptr, u_int32 rptr, u_int32 start, u_int32 end);
int copy_buffer_to_stream(struct vpu_ctx *ctx, void *buffer, uint32_t length);
diff --git a/drivers/mxc/vpu_malone/vpu_mu.c b/drivers/mxc/vpu_malone/vpu_mu.c
index 06dabcf68794..80ea02d6d0d1 100644
--- a/drivers/mxc/vpu_malone/vpu_mu.c
+++ b/drivers/mxc/vpu_malone/vpu_mu.c
@@ -156,7 +156,7 @@ int vpu_sc_check_fuse(struct vpu_dev *dev,
return ret;
}
- val = (fuse >> 2) & 0x3UL;
+ val = (fuse >> VPU_IMX_DECODER_FUSE_OFFSET) & 0x3UL;
if (val == 0x1UL) {
for (i = 0; i < table_size; i++)
if (pformat_table[i].fourcc == VPU_PIX_FMT_HEVC)