Skip to content

media: venus: fix NV12 buffer sizing and incorrect capability alignment #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renjiang-qti wants to merge 3 commits into
base: qcom-6.18.y
Choose a base branch
from
+20 −20
Open

media: venus: fix NV12 buffer sizing and incorrect capability alignment #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6104e5c
FROMLIST: media: qcom: venus: drop extra padding in NV12 raw size cal…
Mar 19, 2026
874e8ae
FROMLIST: media: qcom: venus: relax encoder frame/blur dimension step…
Mar 30, 2026
5d2fbea
FROMLIST: media: qcom: venus: relax encoder frame/blur step size on v6
Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/media/platform/qcom/venus/helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,8 +954,8 @@ static u32 get_framesize_raw_nv12(u32 width, u32 height)
uv_sclines = ALIGN(((height + 1) >> 1), 16);

y_plane = y_stride * y_sclines;
uv_plane = uv_stride * uv_sclines + SZ_4K;
size = y_plane + uv_plane + SZ_8K;
uv_plane = uv_stride * uv_sclines;
size = y_plane + uv_plane;

return ALIGN(size, SZ_4K);
}
Expand Down
20 changes: 10 additions & 10 deletions drivers/media/platform/qcom/venus/hfi_platform_v4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ static const struct hfi_plat_caps caps[] = {
.codec = HFI_VIDEO_CODEC_H264,
.domain = VIDC_SESSION_TYPE_ENC,
.cap_bufs_mode_dynamic = true,
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 16},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 16},
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 1},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 1},
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 1, 36864, 1},
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 120000000, 1},
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
Expand Down Expand Up @@ -173,8 +173,8 @@ static const struct hfi_plat_caps caps[] = {
.codec = HFI_VIDEO_CODEC_HEVC,
.domain = VIDC_SESSION_TYPE_ENC,
.cap_bufs_mode_dynamic = true,
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 16},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 16},
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 1},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 1},
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 1, 36864, 1},
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 120000000, 1},
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
Expand All @@ -195,8 +195,8 @@ static const struct hfi_plat_caps caps[] = {
.caps[19] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
.caps[20] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
.caps[21] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
.num_caps = 24,
.pl[0] = {HFI_HEVC_PROFILE_MAIN, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
.pl[1] = {HFI_HEVC_PROFILE_MAIN10, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
Expand All @@ -210,8 +210,8 @@ static const struct hfi_plat_caps caps[] = {
.codec = HFI_VIDEO_CODEC_VP8,
.domain = VIDC_SESSION_TYPE_ENC,
.cap_bufs_mode_dynamic = true,
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 16},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 16},
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 1},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 1},
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 1, 36864, 1},
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 120000000, 1},
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
Expand All @@ -229,8 +229,8 @@ static const struct hfi_plat_caps caps[] = {
.caps[16] = {HFI_CAPABILITY_P_FRAME_QP, 0, 127, 1},
.caps[17] = {HFI_CAPABILITY_MAX_WORKMODES, 1, 2, 1},
.caps[18] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
.caps[21] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
.caps[22] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
.num_caps = 23,
Expand Down
16 changes: 8 additions & 8 deletions drivers/media/platform/qcom/venus/hfi_platform_v6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ static const struct hfi_plat_caps caps[] = {
.codec = HFI_VIDEO_CODEC_HEVC,
.domain = VIDC_SESSION_TYPE_ENC,
.cap_bufs_mode_dynamic = true,
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 8192, 16},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 8192, 16},
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 8192, 1},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 8192, 1},
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 138240, 1},
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 160000000, 1},
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
Expand All @@ -195,8 +195,8 @@ static const struct hfi_plat_caps caps[] = {
.caps[19] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
.caps[20] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
.caps[21] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
.num_caps = 24,
.pl[0] = {HFI_HEVC_PROFILE_MAIN, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
.pl[1] = {HFI_HEVC_PROFILE_MAIN10, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
Expand All @@ -210,8 +210,8 @@ static const struct hfi_plat_caps caps[] = {
.codec = HFI_VIDEO_CODEC_VP8,
.domain = VIDC_SESSION_TYPE_ENC,
.cap_bufs_mode_dynamic = true,
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 4096, 16},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 4096, 16},
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 4096, 1},
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 4096, 1},
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 36864, 1},
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 74000000, 1},
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
Expand All @@ -229,8 +229,8 @@ static const struct hfi_plat_caps caps[] = {
.caps[16] = {HFI_CAPABILITY_P_FRAME_QP, 0, 127, 1},
.caps[17] = {HFI_CAPABILITY_MAX_WORKMODES, 1, 2, 1},
.caps[18] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
.caps[21] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
.caps[22] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
.num_caps = 23,
Expand Down