Skip to content

Commit e20ae5a

Browse files
Zebra345andersson
authored andcommitted
clk: qcom: mmcc-msm8998: fix venus clock issue
Right now, msm8998 video decoder (venus) is non-functional: $ time mpv --hwdec=v4l2m2m-copy --vd-lavc-software-fallback=no --vo=null --no-audio --untimed --length=30 --quiet demo-480.webm (+) Video --vid=1 (*) (vp9 854x480 29.970fps) Audio --aid=1 --alang=eng (*) (opus 2ch 48000Hz) [ffmpeg/video] vp9_v4l2m2m: output VIDIOC_REQBUFS failed: Connection timed out [ffmpeg/video] vp9_v4l2m2m: no v4l2 output context's buffers [ffmpeg/video] vp9_v4l2m2m: can't configure decoder Could not open codec. Software decoding fallback is disabled. Exiting... (Quit) Bryan O'Donoghue suggested the proper fix: - Set required register offsets in venus GDSC structs. - Set HW_CTRL flag. $ time mpv --hwdec=v4l2m2m-copy --vd-lavc-software-fallback=no --vo=null --no-audio --untimed --length=30 --quiet demo-480.webm (+) Video --vid=1 (*) (vp9 854x480 29.970fps) Audio --aid=1 --alang=eng (*) (opus 2ch 48000Hz) [ffmpeg/video] vp9_v4l2m2m: VIDIOC_G_FMT ioctl [ffmpeg/video] vp9_v4l2m2m: VIDIOC_G_FMT ioctl ... Using hardware decoding (v4l2m2m-copy). VO: [null] 854x480 nv12 Exiting... (End of file) real 0m3.315s user 0m1.277s sys 0m0.453s NOTES: GDSC = Globally Distributed Switch Controller Use same code as mmcc-msm8996 with: s/venus_gdsc/video_top_gdsc/ s/venus_core0_gdsc/video_subcore0_gdsc/ s/venus_core1_gdsc/video_subcore1_gdsc/ https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/caf_migration/kernel.lnx.4.4.r38-rel/include/dt-bindings/clock/msm-clocks-hwio-8996.h https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/caf_migration/kernel.lnx.4.4.r38-rel/include/dt-bindings/clock/msm-clocks-hwio-8998.h 0x1024 = MMSS_VIDEO GDSCR (undocumented) 0x1028 = MMSS_VIDEO_CORE_CBCR 0x1030 = MMSS_VIDEO_AHB_CBCR 0x1034 = MMSS_VIDEO_AXI_CBCR 0x1038 = MMSS_VIDEO_MAXI_CBCR 0x1040 = MMSS_VIDEO_SUBCORE0 GDSCR (undocumented) 0x1044 = MMSS_VIDEO_SUBCORE1 GDSCR (undocumented) 0x1048 = MMSS_VIDEO_SUBCORE0_CBCR 0x104c = MMSS_VIDEO_SUBCORE1_CBCR Fixes: d14b15b ("clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver") Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr> Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Link: https://lore.kernel.org/r/ff4e2e34-a677-4c39-8c29-83655c5512ae@freebox.fr Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 615a292 commit e20ae5a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/clk/qcom/mmcc-msm8998.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,6 +2535,8 @@ static struct clk_branch vmem_ahb_clk = {
25352535

25362536
static struct gdsc video_top_gdsc = {
25372537
.gdscr = 0x1024,
2538+
.cxcs = (unsigned int []){ 0x1028, 0x1034, 0x1038 },
2539+
.cxc_count = 3,
25382540
.pd = {
25392541
.name = "video_top",
25402542
},
@@ -2543,20 +2545,26 @@ static struct gdsc video_top_gdsc = {
25432545

25442546
static struct gdsc video_subcore0_gdsc = {
25452547
.gdscr = 0x1040,
2548+
.cxcs = (unsigned int []){ 0x1048 },
2549+
.cxc_count = 1,
25462550
.pd = {
25472551
.name = "video_subcore0",
25482552
},
25492553
.parent = &video_top_gdsc.pd,
25502554
.pwrsts = PWRSTS_OFF_ON,
2555+
.flags = HW_CTRL,
25512556
};
25522557

25532558
static struct gdsc video_subcore1_gdsc = {
25542559
.gdscr = 0x1044,
2560+
.cxcs = (unsigned int []){ 0x104c },
2561+
.cxc_count = 1,
25552562
.pd = {
25562563
.name = "video_subcore1",
25572564
},
25582565
.parent = &video_top_gdsc.pd,
25592566
.pwrsts = PWRSTS_OFF_ON,
2567+
.flags = HW_CTRL,
25602568
};
25612569

25622570
static struct gdsc mdss_gdsc = {

0 commit comments

Comments
 (0)