From: kyrie wu <[email protected]>
if no found huffman table in file, hw use standard table
Signed-off-by: kyrie wu <[email protected]>
Signed-off-by: irui wang <[email protected]>
---
This patch dependents on:
https://patchwork.linuxtv.org/project/linux-media/cover/[email protected]/
---
.../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 9 ++
.../platform/mediatek/jpeg/mtk_jpeg_dec_hw.h | 1 +
.../mediatek/jpeg/mtk_jpeg_dec_parse.c | 97 +++++++++++--------
.../platform/mediatek/jpeg/mtk_jpeg_dec_reg.h | 2 +
4 files changed, 69 insertions(+), 40 deletions(-)
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
index 869068fac5e2..62119ef959dc 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
@@ -378,6 +378,14 @@ static void mtk_jpeg_dec_set_q_table(void __iomem *base, u32 id0, u32 id1,
writel(val, base + JPGDEC_REG_QT_ID);
}
+static void mtk_jpeg_dec_set_huffman_mode(void __iomem *base, u8 huffman_tb_exist)
+{
+ if (!huffman_tb_exist) {
+ writel(0x1, base + JPGDEC_REG_ST_HUFFMAN_EN);
+ writel(0x0, base + JPGDEC_REG_BUILD_HUFF_INDEX);
+ }
+}
+
static void mtk_jpeg_dec_set_dma_group(void __iomem *base, u32 mcu_group,
u32 group_num, u32 last_mcu)
{
@@ -423,6 +431,7 @@ void mtk_jpeg_dec_set_config(void __iomem *base,
cfg->comp_id[2]);
mtk_jpeg_dec_set_q_table(base, cfg->qtbl_num[0],
cfg->qtbl_num[1], cfg->qtbl_num[2]);
+ mtk_jpeg_dec_set_huffman_mode(base, cfg->huffman_tb_exist);
mtk_jpeg_dec_set_sampling_factor(base, cfg->comp_num,
cfg->sampling_w[0],
cfg->sampling_h[0],
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h
index 8c31c6b12417..660df1bee463 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h
@@ -54,6 +54,7 @@ struct mtk_jpeg_dec_param {
u32 uv_size;
u32 dec_size;
u8 uv_brz_w;
+ u8 huffman_tb_exist;
};
struct mtk_jpeg_bs {
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
index b95c45791c29..d0f7a87b3e4b 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
@@ -12,6 +12,7 @@
#define TEM 0x01
#define SOF0 0xc0
+#define DHT 0xc4
#define RST 0xd0
#define SOI 0xd8
#define EOI 0xd9
@@ -54,17 +55,65 @@ static void read_skip(struct mtk_jpeg_stream *stream, long len)
read_byte(stream);
}
+static bool parse_header(struct mtk_jpeg_stream *stream,
+ struct mtk_jpeg_dec_param *param)
+{
+ int i, byte;
+ u32 word;
+
+ /* length */
+ if (read_word_be(stream, &word))
+ goto parse_end;
+
+ /* precision */
+ if (read_byte(stream) == -1)
+ goto parse_end;
+
+ if (read_word_be(stream, &word))
+ goto parse_end;
+ param->pic_h = word;
+
+ if (read_word_be(stream, &word))
+ goto parse_end;
+ param->pic_w = word;
+
+ param->comp_num = read_byte(stream);
+ if (param->comp_num != 1 && param->comp_num != 3)
+ goto parse_end;
+
+ for (i = 0; i < param->comp_num; i++) {
+ param->comp_id[i] = read_byte(stream);
+ if (param->comp_id[i] == -1)
+ break;
+
+ /* sampling */
+ byte = read_byte(stream);
+ if (byte == -1)
+ break;
+ param->sampling_w[i] = (byte >> 4) & 0x0F;
+ param->sampling_h[i] = byte & 0x0F;
+
+ param->qtbl_num[i] = read_byte(stream);
+ if (param->qtbl_num[i] == -1)
+ break;
+ }
+
+parse_end:
+ return !(i == param->comp_num);
+}
+
static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va,
u32 src_size)
{
bool notfound = true;
+ bool file_end = false;
struct mtk_jpeg_stream stream;
stream.addr = src_addr_va;
stream.size = src_size;
stream.curr = 0;
- while (notfound) {
+ while (!file_end && (!param->huffman_tb_exist || notfound)) {
int i, length, byte;
u32 word;
@@ -84,50 +133,18 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va,
length = 0;
switch (byte) {
case SOF0:
- /* length */
- if (read_word_be(&stream, &word))
- break;
-
- /* precision */
- if (read_byte(&stream) == -1)
- break;
-
- if (read_word_be(&stream, &word))
- break;
- param->pic_h = word;
-
- if (read_word_be(&stream, &word))
- break;
- param->pic_w = word;
-
- param->comp_num = read_byte(&stream);
- if (param->comp_num != 1 && param->comp_num != 3)
- break;
-
- for (i = 0; i < param->comp_num; i++) {
- param->comp_id[i] = read_byte(&stream);
- if (param->comp_id[i] == -1)
- break;
-
- /* sampling */
- byte = read_byte(&stream);
- if (byte == -1)
- break;
- param->sampling_w[i] = (byte >> 4) & 0x0F;
- param->sampling_h[i] = byte & 0x0F;
-
- param->qtbl_num[i] = read_byte(&stream);
- if (param->qtbl_num[i] == -1)
- break;
- }
-
- notfound = !(i == param->comp_num);
+ notfound = parse_header(&stream, param);
break;
case RST ... RST + 7:
case SOI:
- case EOI:
case TEM:
break;
+ case EOI:
+ file_end = true;
+ break;
+ case DHT:
+ param->huffman_tb_exist = 1;
+ break;
default:
if (read_word_be(&stream, &word))
break;
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h
index 27b7711ca341..b5ae4d9fe0a8 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h
@@ -45,6 +45,8 @@
#define JPGDEC_REG_QT_ID 0x0270
#define JPGDEC_REG_INTERRUPT_STATUS 0x0274
#define JPGDEC_REG_STATUS 0x0278
+#define JPGDEC_REG_ST_HUFFMAN_EN 0x320
+#define JPGDEC_REG_BUILD_HUFF_INDEX 0x330
#define JPGDEC_REG_BIT_STREAM_SIZE 0x0344
#endif /* _MTK_JPEG_REG_H */
--
2.18.0
Hi Irui,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on media-tree/master]
[also build test WARNING on linus/master v6.3-rc2 next-20230317]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Irui-Wang/media-mtk-jpeg-fixes-use-standard-huffman-table-issue/20230316-163606
base: git://linuxtv.org/media_tree.git master
patch link: https://lore.kernel.org/r/20230316081925.10247-1-irui.wang%40mediatek.com
patch subject: [V1] media: mtk-jpeg: fixes use standard huffman table issue
config: s390-randconfig-r002-20230312 (https://download.01.org/0day-ci/archive/20230318/[email protected]/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 67409911353323ca5edf2049ef0df54132fa1ca7)
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
# install s390 cross compiling tool for clang build
# apt-get install binutils-s390x-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/896259d7c51e49e9137901c69ca073ee3ed959b0
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Irui-Wang/media-mtk-jpeg-fixes-use-standard-huffman-table-issue/20230316-163606
git checkout 896259d7c51e49e9137901c69ca073ee3ed959b0
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash drivers/media/platform/mediatek/jpeg/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:11:
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h:11:
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h:12:
In file included from include/media/videobuf2-core.h:18:
In file included from include/linux/dma-buf.h:16:
In file included from include/linux/iosys-map.h:10:
In file included from include/linux/io.h:13:
In file included from arch/s390/include/asm/io.h:75:
include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __raw_readb(PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:37:59: note: expanded from macro '__le16_to_cpu'
#define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
^
include/uapi/linux/swab.h:102:54: note: expanded from macro '__swab16'
#define __swab16(x) (__u16)__builtin_bswap16((__u16)(x))
^
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:11:
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h:11:
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h:12:
In file included from include/media/videobuf2-core.h:18:
In file included from include/linux/dma-buf.h:16:
In file included from include/linux/iosys-map.h:10:
In file included from include/linux/io.h:13:
In file included from arch/s390/include/asm/io.h:75:
include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:35:59: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
^
include/uapi/linux/swab.h:115:54: note: expanded from macro '__swab32'
#define __swab32(x) (__u32)__builtin_bswap32((__u32)(x))
^
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:11:
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h:11:
In file included from drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h:12:
In file included from include/media/videobuf2-core.h:18:
In file included from include/linux/dma-buf.h:16:
In file included from include/linux/iosys-map.h:10:
In file included from include/linux/io.h:13:
In file included from arch/s390/include/asm/io.h:75:
include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writeb(value, PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:692:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
readsb(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:700:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
readsw(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:708:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
readsl(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:717:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
writesb(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:726:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
writesw(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
include/asm-generic/io.h:735:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
writesl(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
>> drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:81:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (param->comp_num != 1 && param->comp_num != 3)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:102:11: note: uninitialized use occurs here
return !(i == param->comp_num);
^
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:81:2: note: remove the 'if' if its condition is always false
if (param->comp_num != 1 && param->comp_num != 3)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:76:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (read_word_be(stream, &word))
^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:102:11: note: uninitialized use occurs here
return !(i == param->comp_num);
^
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:76:2: note: remove the 'if' if its condition is always false
if (read_word_be(stream, &word))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:72:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (read_word_be(stream, &word))
^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:102:11: note: uninitialized use occurs here
return !(i == param->comp_num);
^
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:72:2: note: remove the 'if' if its condition is always false
if (read_word_be(stream, &word))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:69:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (read_byte(stream) == -1)
^~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:102:11: note: uninitialized use occurs here
return !(i == param->comp_num);
^
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:69:2: note: remove the 'if' if its condition is always false
if (read_byte(stream) == -1)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:65:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (read_word_be(stream, &word))
^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:102:11: note: uninitialized use occurs here
return !(i == param->comp_num);
^
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:65:2: note: remove the 'if' if its condition is always false
if (read_word_be(stream, &word))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:61:7: note: initialize the variable 'i' to silence this warning
int i, byte;
^
= 0
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:117:7: warning: unused variable 'i' [-Wunused-variable]
int i, length, byte;
^
18 warnings generated.
vim +81 drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
57
58 static bool parse_header(struct mtk_jpeg_stream *stream,
59 struct mtk_jpeg_dec_param *param)
60 {
61 int i, byte;
62 u32 word;
63
64 /* length */
65 if (read_word_be(stream, &word))
66 goto parse_end;
67
68 /* precision */
69 if (read_byte(stream) == -1)
70 goto parse_end;
71
72 if (read_word_be(stream, &word))
73 goto parse_end;
74 param->pic_h = word;
75
76 if (read_word_be(stream, &word))
77 goto parse_end;
78 param->pic_w = word;
79
80 param->comp_num = read_byte(stream);
> 81 if (param->comp_num != 1 && param->comp_num != 3)
82 goto parse_end;
83
84 for (i = 0; i < param->comp_num; i++) {
85 param->comp_id[i] = read_byte(stream);
86 if (param->comp_id[i] == -1)
87 break;
88
89 /* sampling */
90 byte = read_byte(stream);
91 if (byte == -1)
92 break;
93 param->sampling_w[i] = (byte >> 4) & 0x0F;
94 param->sampling_h[i] = byte & 0x0F;
95
96 param->qtbl_num[i] = read_byte(stream);
97 if (param->qtbl_num[i] == -1)
98 break;
99 }
100
101 parse_end:
102 return !(i == param->comp_num);
103 }
104
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests