FAILED: patch "[PATCH] media: chips-media: wave5: Support CBP profile" failed to apply to 7.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 7.1-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-7.1.y
git checkout FETCH_HEAD
git cherry-pick -x f8505f9d6b223a26854003bfdba1a0772457886d
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072917-haiku-scalping-5001@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f8505f9d6b223a26854003bfdba1a0772457886d Mon Sep 17 00:00:00 2001
From: Jackson Lee <[email protected]>
Date: Tue, 24 Mar 2026 14:03:59 +0900
Subject: [PATCH] media: chips-media: wave5: Support CBP profile
Constrained Baseline Profile (CBP) and Baseline Profile (BP) have been treated as the same.
Introduce the ability to differentiate between the two.
drivers/media/platform/chips-media/wave5/wave5-hw.c +3 -0
@@ -1763,6 +1763,9 @@ int wave5_vpu_enc_init_seq(struct vpu_instance *inst) (p_param->skip_intra_trans <<25 ) | (p_param->strong_intra_smooth_enable <<27 ) | (p_param->en_still_picture <<30 ); + else if (inst->std == W_AVC_ENC) + reg_val |= (p_param->constraint_set1_flag << 29); +vpu_write_reg (inst->dev,W5_CMD_ENC_SEQ_SPS_PARAM , reg_val); reg_val = (p_param->lossless_enable) |
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +4 -1
@@ -918,6 +918,8 @@ static int wave5_vpu_enc_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE : inst->enc_param.profile =H264_PROFILE_BP ; inst->bit_depth =8 ; +if (ctrl->val ==V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE ) + inst->enc_param.constraint_set1_flag =1 ;break ;case V4L2_MPEG_VIDEO_H264_PROFILE_MAIN : inst->enc_param.profile =H264_PROFILE_MP ;
@@ -1194,6 +1196,7 @@ static int wave5_set_enc_openparam(struct enc_open_param *open_param, open_param->wave_param.intra_period = input.avc_idr_period; } }else { + open_param->wave_param.constraint_set1_flag = input.constraint_set1_flag; open_param->wave_param.avc_idr_period = input.avc_idr_period; } open_param->wave_param.entropy_coding_mode = input.entropy_coding_mode;
@@ -1666,7 +1669,7 @@ static int wave5_vpu_open_enc(struct file *filp) -6, 6, 1, 0);v4l2_ctrl_new_std (v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM , -0 ,1 ,1 ,1 ); +0 ,1 ,1 ,0 );v4l2_ctrl_new_std (v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION ,0 ,1 ,1 ,0 );
drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +1 -0
@@ -570,6 +570,7 @@ struct enc_wave_param { u32 transform8x8_enable: 1; /* enable 8x8 intra prediction and 8x8 transform */ u32 mb_level_rc_enable: 1; /* enable MB-level rate control */ u32 forced_idr_header_enable: 1; /* enable header encoding before IDR frame */ + u32 constraint_set1_flag: 1; /* enable CBP */ u32 bg_detection: 1; /* enable background detection */ };
Sasha Levin
maintainerPATCH 1/1 media: chips-media: wave5: Support CBP profile
From: Jackson Lee <[email protected]>
[ Upstream commit f8505f9d6b223a26854003bfdba1a0772457886d ]
Constrained Baseline Profile (CBP) and Baseline Profile (BP) have been treated as the same.
Introduce the ability to differentiate between the two.
--- drivers/media/platform/chips-media/wave5/wave5-hw.c | 3 +++ drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 5 ++++- drivers/media/platform/chips-media/wave5/wave5-vpuapi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/media/platform/chips-media/wave5/wave5-hw.c +3 -0
@@ -1762,6 +1762,9 @@ int wave5_vpu_enc_init_seq(struct vpu_instance *inst) (p_param->skip_intra_trans <<25 ) | (p_param->strong_intra_smooth_enable <<27 ) | (p_param->en_still_picture <<30 ); + else if (inst->std == W_AVC_ENC) + reg_val |= (p_param->constraint_set1_flag << 29); +vpu_write_reg (inst->dev,W5_CMD_ENC_SEQ_SPS_PARAM , reg_val); reg_val = (p_param->lossless_enable) |
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +4 -1
@@ -915,6 +915,8 @@ static int wave5_vpu_enc_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE : inst->enc_param.profile =H264_PROFILE_BP ; inst->bit_depth =8 ; +if (ctrl->val ==V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE ) + inst->enc_param.constraint_set1_flag =1 ;break ;case V4L2_MPEG_VIDEO_H264_PROFILE_MAIN : inst->enc_param.profile =H264_PROFILE_MP ;
@@ -1190,6 +1192,7 @@ static int wave5_set_enc_openparam(struct enc_open_param *open_param, open_param->wave_param.intra_period = input.avc_idr_period; } }else { + open_param->wave_param.constraint_set1_flag = input.constraint_set1_flag; open_param->wave_param.avc_idr_period = input.avc_idr_period; } open_param->wave_param.entropy_coding_mode = input.entropy_coding_mode;
@@ -1662,7 +1665,7 @@ static int wave5_vpu_open_enc(struct file *filp) -6, 6, 1, 0);v4l2_ctrl_new_std (v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM , -0 ,1 ,1 ,1 ); +0 ,1 ,1 ,0 );v4l2_ctrl_new_std (v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION ,0 ,1 ,1 ,0 );
drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +1 -0
@@ -570,6 +570,7 @@ struct enc_wave_param { u32 transform8x8_enable: 1; /* enable 8x8 intra prediction and 8x8 transform */ u32 mb_level_rc_enable: 1; /* enable MB-level rate control */ u32 forced_idr_header_enable: 1; /* enable header encoding before IDR frame */ + u32 constraint_set1_flag: 1; /* enable CBP */ };struct enc_open_param {
Signature · 1 line
2.53.0