Skip to content

Commit 673ce11

Browse files
ndufresnegregkh
authored andcommitted
media: verisilicon: Fix AV1 decoder clock frequency
commit 0135018 upstream. The desired clock frequency was correctly set to 400MHz in the device tree but was lowered by the driver to 300MHz breaking 4K 60Hz content playback. Fix the issue by removing the driver call to clk_set_rate(), which reduce the amount of board specific code. Fixes: 003afda ("media: verisilicon: Enable AV1 decoder on rk3588") Cc: stable@vger.kernel.org Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 130474b commit 673ce11

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

drivers/media/platform/verisilicon/rockchip_vpu_hw.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#define RK3066_ACLK_MAX_FREQ (300 * 1000 * 1000)
1919
#define RK3288_ACLK_MAX_FREQ (400 * 1000 * 1000)
20-
#define RK3588_ACLK_MAX_FREQ (300 * 1000 * 1000)
2120

2221
#define ROCKCHIP_VPU981_MIN_SIZE 64
2322

@@ -454,13 +453,6 @@ static int rk3066_vpu_hw_init(struct hantro_dev *vpu)
454453
return 0;
455454
}
456455

457-
static int rk3588_vpu981_hw_init(struct hantro_dev *vpu)
458-
{
459-
/* Bump ACLKs to max. possible freq. to improve performance. */
460-
clk_set_rate(vpu->clocks[0].clk, RK3588_ACLK_MAX_FREQ);
461-
return 0;
462-
}
463-
464456
static int rockchip_vpu_hw_init(struct hantro_dev *vpu)
465457
{
466458
/* Bump ACLK to max. possible freq. to improve performance. */
@@ -821,7 +813,6 @@ const struct hantro_variant rk3588_vpu981_variant = {
821813
.codec_ops = rk3588_vpu981_codec_ops,
822814
.irqs = rk3588_vpu981_irqs,
823815
.num_irqs = ARRAY_SIZE(rk3588_vpu981_irqs),
824-
.init = rk3588_vpu981_hw_init,
825816
.clk_names = rk3588_vpu981_vpu_clk_names,
826817
.num_clocks = ARRAY_SIZE(rk3588_vpu981_vpu_clk_names)
827818
};

0 commit comments

Comments
 (0)