FAILED: patch "[PATCH] media: amphion: Remove vpu_vb_is_codecconfig" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 634c2cd17bd021487c57b95973bddb14be8002ff
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010508-varnish-estimate-f594@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 634c2cd17bd021487c57b95973bddb14be8002ff Mon Sep 17 00:00:00 2001
From: Ming Qian <[email protected]>
Date: Tue, 16 Sep 2025 14:08:53 +0800
Subject: [PATCH] media: amphion: Remove vpu_vb_is_codecconfig
Currently the function vpu_vb_is_codecconfig() always returns 0. Delete it and its related code.
drivers/media/platform/amphion/vpu_malone.c +3 -20
@@ -1337,22 +1337,18 @@ static int vpu_malone_insert_scode_vc1_g_seq(struct malone_scode_t *scode) {if (!scode->inst->total_input_count)return 0 ; -if (vpu_vb_is_codecconfig (to_vb2_v4l2_buffer (scode->vb))) - scode->need_data =0 ;return 0 ; }static int vpu_malone_insert_scode_vc1_g_pic (struct malone_scode_t *scode) { -struct vb2_v4l2_buffer *vbuf;u8 nal_hdr[MALONE_VC1_NAL_HEADER_LEN ];u32 *data =NULL ;int ret; - vbuf =to_vb2_v4l2_buffer (scode->vb); data =vb2_plane_vaddr (scode->vb,0 ); -if (scode->inst->total_input_count ==0 ||vpu_vb_is_codecconfig (vbuf)) +if (scode->inst->total_input_count ==0 )return 0 ;if (MALONE_VC1_CONTAIN_NAL (*data))return 0 ;
@@ -1373,8 +1369,6 @@ static int vpu_malone_insert_scode_vc1_l_seq(struct malone_scode_t *scode)int size =0 ;u8 rcv_seqhdr[MALONE_VC1_RCV_SEQ_HEADER_LEN ]; -if (vpu_vb_is_codecconfig (to_vb2_v4l2_buffer (scode->vb))) - scode->need_data =0 ;if (scode->inst->total_input_count)return 0 ; scode->need_data =0 ;
@@ -1560,7 +1554,7 @@ static int vpu_malone_input_frame_data(struct vpu_malone_str_buffer __iomem *str scode.vb = vb; scode.wptr = wptr; scode.need_data =1 ; -if (vbuf->sequence ==0 ||vpu_vb_is_codecconfig (vbuf)) +if (vbuf->sequence ==0 ) ret =vpu_malone_insert_scode (&scode,SCODE_SEQUENCE );if (ret <0 )
@@ -1596,7 +1590,7 @@ static int vpu_malone_input_frame_data(struct vpu_malone_str_buffer __iomem *str* This module is currently only supported for the H264 and HEVC formats, * for other formats, vpu_malone_add_scode() will return 0. */ -if ((disp_imm || low_latency) && !vpu_vb_is_codecconfig (vbuf)) { +if (disp_imm || low_latency) { ret = vpu_malone_add_scode(inst->core->iface, inst->id, &inst->stream_buffer,
@@ -1643,7 +1637,6 @@ int vpu_malone_input_frame(struct vpu_shared_addr *shared, struct vpu_inst *inst, struct vb2_buffer *vb) { struct vpu_dec_ctrl *hc = shared->priv; -struct vb2_v4l2_buffer *vbuf;struct vpu_malone_str_buffer __iomem *str_buf = hc->str_buf[inst->id];u32 disp_imm = hc->codec_param[inst->id].disp_imm;u32 size;
@@ -1657,16 +1650,6 @@ int vpu_malone_input_frame(struct vpu_shared_addr *shared,return ret; size = ret; -/* -* if buffer only contain codec data, and the timestamp is invalid, -* don't put the invalid timestamp to resync -* merge the data to next frame -*/ - vbuf =to_vb2_v4l2_buffer (vb); -if (vpu_vb_is_codecconfig (vbuf)) { - inst->extra_size += size; -return 0 ; - }if (inst->extra_size) { size += inst->extra_size; inst->extra_size =0 ;
drivers/media/platform/amphion/vpu_v4l2.c +0 -10
@@ -349,16 +349,6 @@ struct vb2_v4l2_buffer *vpu_next_src_buf(struct vpu_inst *inst)if (!src_buf ||vpu_get_buffer_state (src_buf) ==VPU_BUF_STATE_IDLE )return NULL ; -while (vpu_vb_is_codecconfig (src_buf)) { -v4l2_m2m_src_buf_remove (inst->fh.m2m_ctx); -vpu_set_buffer_state (src_buf,VPU_BUF_STATE_IDLE ); -v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_DONE ); - - src_buf =v4l2_m2m_next_src_buf (inst->fh.m2m_ctx); -if (!src_buf ||vpu_get_buffer_state (src_buf) ==VPU_BUF_STATE_IDLE ) -return NULL ; - } -return src_buf; }
drivers/media/platform/amphion/vpu_v4l2.h +0 -10
@@ -39,14 +39,4 @@ static inline struct vpu_format *vpu_get_format(struct vpu_inst *inst, u32 type) else return &inst->cap_format; } - -static inline int vpu_vb_is_codecconfig (struct vb2_v4l2_buffer *vbuf) -{ -#ifdef V4L2_BUF_FLAG_CODECCONFIG -return (vbuf->flags &V4L2_BUF_FLAG_CODECCONFIG ) ?1 :0 ; -#else -return 0 ; -#endif -} -#endif
Sasha Levin
maintainerPATCH 1/3 media: amphion: Add a frame flush mode for decoder
From: Ming Qian <[email protected]>
[ Upstream commit 9ea16ba6eaf93f25f61855751f71e2e701709ddf ]
By default the amphion decoder will pre-parse 3 frames before starting to decode the first frame. Alternatively, a block of flush padding data can be appended to the frame, which will ensure that the decoder can start decoding immediately after parsing the flush padding data, thus potentially reducing decoding latency.
This mode was previously only enabled, when the display delay was set to
0. Allow the user to manually toggle the use of that mode via a module parameter called low_latency, which enables the mode without changing the display order.
Stable-dep-of: 634c2cd17bd0 ("media: amphion: Remove vpu_vb_is_codecconfig")
--- drivers/media/platform/amphion/vpu_malone.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/media/platform/amphion/vpu_malone.c +13 -1
@@ -25,6 +25,10 @@#include "vpu_imx8q.h" #include "vpu_malone.h" +static bool low_latency; +module_param (low_latency, bool,0644 ); +MODULE_PARM_DESC (low_latency,"Set low latency frame flush mode: 0 (disable) or 1 (enable)" ); +#define CMD_SIZE 25600#define MSG_SIZE 25600#define CODEC_SIZE 0x1000
@@ -1562,7 +1566,15 @@ static int vpu_malone_input_frame_data(struct vpu_malone_str_buffer __iomem *strvpu_malone_update_wptr (str_buf, wptr); -if (disp_imm && !vpu_vb_is_codecconfig (vbuf)) { +/* +* Enable the low latency flush mode if display delay is set to 0 +* or the low latency frame flush mode if it is set to 1. +* The low latency flush mode requires some padding data to be appended to each frame, +* but there must not be any padding data between the sequence header and the frame. +* This module is currently only supported for the H264 and HEVC formats, +* for other formats, vpu_malone_add_scode() will return 0. +*/ +if ((disp_imm || low_latency) && !vpu_vb_is_codecconfig (vbuf)) { ret = vpu_malone_add_scode(inst->core->iface, inst->id, &inst->stream_buffer,
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/3 media: amphion: Make some vpu_v4l2 functions static
From: Laurent Pinchart <[email protected]>
[ Upstream commit 5d1e54bb4dc6741284a3ed587e994308ddee2f16 ]
Some functions defined in vpu_v4l2.c are never used outside of that compilation unit. Make them static.
Stable-dep-of: 634c2cd17bd0 ("media: amphion: Remove vpu_vb_is_codecconfig")
--- drivers/media/platform/amphion/vpu_v4l2.c | 12 +++++++++--- drivers/media/platform/amphion/vpu_v4l2.h | 8 -------- 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/media/platform/amphion/vpu_v4l2.c +9 -3
@@ -24,6 +24,11 @@#include "vpu_msgs.h" #include "vpu_helpers.h" +static char *vpu_type_name (u32 type) +{ +return V4L2_TYPE_IS_OUTPUT (type) ?"output" :"capture" ; +} +void vpu_inst_lock (struct vpu_inst *inst) {mutex_lock (&inst->lock);
@@ -42,7 +47,7 @@ dma_addr_t vpu_get_vb_phy_addr(struct vb2_buffer *vb, u32 plane_no) vb->planes[plane_no].data_offset; } -unsigned int vpu_get_vb_length (struct vb2_buffer *vb,u32 plane_no) +static unsigned int vpu_get_vb_length (struct vb2_buffer *vb,u32 plane_no) {if (plane_no >= vb->num_planes)return 0 ;
@@ -81,7 +86,7 @@ void vpu_v4l2_set_error(struct vpu_inst *inst)vpu_inst_unlock (inst); } -int vpu_notify_eos (struct vpu_inst *inst) +static int vpu_notify_eos (struct vpu_inst *inst) {static const struct v4l2_event ev = { .id =0 ,
@@ -562,7 +567,8 @@ static void vpu_vb2_buf_finish(struct vb2_buffer *vb)call_void_vop (inst, on_queue_empty, q->type); } -void vpu_vb2_buffers_return (struct vpu_inst *inst,unsigned int type,enum vb2_buffer_state state) +static void vpu_vb2_buffers_return (struct vpu_inst *inst,unsigned int type, +enum vb2_buffer_state state) {struct vb2_v4l2_buffer *buf;
drivers/media/platform/amphion/vpu_v4l2.h +0 -8
@@ -26,15 +26,12 @@ void vpu_skip_frame(struct vpu_inst *inst, int count);struct vb2_v4l2_buffer *vpu_find_buf_by_sequence (struct vpu_inst *inst,u32 type,u32 sequence);struct vb2_v4l2_buffer *vpu_find_buf_by_idx (struct vpu_inst *inst,u32 type,u32 idx);void vpu_v4l2_set_error (struct vpu_inst *inst); -int vpu_notify_eos (struct vpu_inst *inst);int vpu_notify_source_change (struct vpu_inst *inst);int vpu_set_last_buffer_dequeued (struct vpu_inst *inst,bool eos); -void vpu_vb2_buffers_return (struct vpu_inst *inst,unsigned int type,enum vb2_buffer_state state);int vpu_get_num_buffers (struct vpu_inst *inst,u32 type);bool vpu_is_source_empty (struct vpu_inst *inst);dma_addr_t vpu_get_vb_phy_addr (struct vb2_buffer *vb,u32 plane_no); -unsigned int vpu_get_vb_length (struct vb2_buffer *vb,u32 plane_no);static inline struct vpu_format *vpu_get_format (struct vpu_inst *inst,u32 type) {if (V4L2_TYPE_IS_OUTPUT (type))
@@ -43,11 +40,6 @@ static inline struct vpu_format *vpu_get_format(struct vpu_inst *inst, u32 type)return &inst->cap_format; } -static inline char *vpu_type_name (u32 type) -{ -return V4L2_TYPE_IS_OUTPUT (type) ?"output" :"capture" ; -} -static inline int vpu_vb_is_codecconfig (struct vb2_v4l2_buffer *vbuf) {#ifdef V4L2_BUF_FLAG_CODECCONFIG
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 3/3 media: amphion: Remove vpu_vb_is_codecconfig
In reply to Sasha LevinFrom: Ming Qian <[email protected]>
[ Upstream commit 634c2cd17bd021487c57b95973bddb14be8002ff ]
Currently the function vpu_vb_is_codecconfig() always returns 0. Delete it and its related code.
--- drivers/media/platform/amphion/vpu_malone.c | 23 +++------------------ drivers/media/platform/amphion/vpu_v4l2.c | 10 --------- drivers/media/platform/amphion/vpu_v4l2.h | 10 --------- 3 files changed, 3 insertions(+), 40 deletions(-)
drivers/media/platform/amphion/vpu_malone.c +3 -20
@@ -1315,22 +1315,18 @@ static int vpu_malone_insert_scode_vc1_g_seq(struct malone_scode_t *scode) {if (!scode->inst->total_input_count)return 0 ; -if (vpu_vb_is_codecconfig (to_vb2_v4l2_buffer (scode->vb))) - scode->need_data =0 ;return 0 ; }static int vpu_malone_insert_scode_vc1_g_pic (struct malone_scode_t *scode) { -struct vb2_v4l2_buffer *vbuf;u8 nal_hdr[MALONE_VC1_NAL_HEADER_LEN ];u32 *data =NULL ;int ret; - vbuf =to_vb2_v4l2_buffer (scode->vb); data =vb2_plane_vaddr (scode->vb,0 ); -if (scode->inst->total_input_count ==0 ||vpu_vb_is_codecconfig (vbuf)) +if (scode->inst->total_input_count ==0 )return 0 ;if (MALONE_VC1_CONTAIN_NAL (*data))return 0 ;
@@ -1351,8 +1347,6 @@ static int vpu_malone_insert_scode_vc1_l_seq(struct malone_scode_t *scode)int size =0 ;u8 rcv_seqhdr[MALONE_VC1_RCV_SEQ_HEADER_LEN ]; -if (vpu_vb_is_codecconfig (to_vb2_v4l2_buffer (scode->vb))) - scode->need_data =0 ;if (scode->inst->total_input_count)return 0 ; scode->need_data =0 ;
@@ -1538,7 +1532,7 @@ static int vpu_malone_input_frame_data(struct vpu_malone_str_buffer __iomem *str scode.vb = vb; scode.wptr = wptr; scode.need_data =1 ; -if (vbuf->sequence ==0 ||vpu_vb_is_codecconfig (vbuf)) +if (vbuf->sequence ==0 ) ret =vpu_malone_insert_scode (&scode,SCODE_SEQUENCE );if (ret <0 )
@@ -1574,7 +1568,7 @@ static int vpu_malone_input_frame_data(struct vpu_malone_str_buffer __iomem *str* This module is currently only supported for the H264 and HEVC formats, * for other formats, vpu_malone_add_scode() will return 0. */ -if ((disp_imm || low_latency) && !vpu_vb_is_codecconfig (vbuf)) { +if (disp_imm || low_latency) { ret = vpu_malone_add_scode(inst->core->iface, inst->id, &inst->stream_buffer,
@@ -1621,7 +1615,6 @@ int vpu_malone_input_frame(struct vpu_shared_addr *shared, struct vpu_inst *inst, struct vb2_buffer *vb) { struct vpu_dec_ctrl *hc = shared->priv; -struct vb2_v4l2_buffer *vbuf;struct vpu_malone_str_buffer __iomem *str_buf = hc->str_buf[inst->id];u32 disp_imm = hc->codec_param[inst->id].disp_imm;u32 size;
@@ -1635,16 +1628,6 @@ int vpu_malone_input_frame(struct vpu_shared_addr *shared,return ret; size = ret; -/* -* if buffer only contain codec data, and the timestamp is invalid, -* don't put the invalid timestamp to resync -* merge the data to next frame -*/ - vbuf =to_vb2_v4l2_buffer (vb); -if (vpu_vb_is_codecconfig (vbuf)) { - inst->extra_size += size; -return 0 ; - }if (inst->extra_size) { size += inst->extra_size; inst->extra_size =0 ;
drivers/media/platform/amphion/vpu_v4l2.c +0 -10
@@ -349,16 +349,6 @@ struct vb2_v4l2_buffer *vpu_next_src_buf(struct vpu_inst *inst)if (!src_buf ||vpu_get_buffer_state (src_buf) ==VPU_BUF_STATE_IDLE )return NULL ; -while (vpu_vb_is_codecconfig (src_buf)) { -v4l2_m2m_src_buf_remove (inst->fh.m2m_ctx); -vpu_set_buffer_state (src_buf,VPU_BUF_STATE_IDLE ); -v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_DONE ); - - src_buf =v4l2_m2m_next_src_buf (inst->fh.m2m_ctx); -if (!src_buf ||vpu_get_buffer_state (src_buf) ==VPU_BUF_STATE_IDLE ) -return NULL ; - } -return src_buf; }
drivers/media/platform/amphion/vpu_v4l2.h +0 -10
@@ -39,14 +39,4 @@ static inline struct vpu_format *vpu_get_format(struct vpu_inst *inst, u32 type) else return &inst->cap_format; } - -static inline int vpu_vb_is_codecconfig (struct vb2_v4l2_buffer *vbuf) -{ -#ifdef V4L2_BUF_FLAG_CODECCONFIG -return (vbuf->flags &V4L2_BUF_FLAG_CODECCONFIG ) ?1 :0 ; -#else -return 0 ; -#endif -} -#endif
Signature · 1 line
2.51.0