From 88af3cfd91ebec18dd9032a30614b2833964f7b8 Mon Sep 17 00:00:00 2001 From: alpha lin Date: Thu, 11 Apr 2019 17:18:36 +0800 Subject: [PATCH] rockchip/rk3288: bugfix, incorrect clock operate on hevc On rk3288, vpu clock should be raised when 4k h.264 decoding, but on previous judgement branch code, judgement do not distinguish vpu or hevc would make incorrect clock raise when hevc running. Change-Id: Idb8e5a9dde1e8eb063658c9610ac839c8c69b6ce Signed-off-by: Alpha Lin --- drivers/video/rockchip/vcodec/vcodec_service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/rockchip/vcodec/vcodec_service.c b/drivers/video/rockchip/vcodec/vcodec_service.c index a485c2437f17..a387016d5e93 100644 --- a/drivers/video/rockchip/vcodec/vcodec_service.c +++ b/drivers/video/rockchip/vcodec/vcodec_service.c @@ -2277,7 +2277,8 @@ static void vcodec_get_reg_freq_rk3288(struct vpu_subdev_data *data, { vcodec_get_reg_freq_default(data, reg); - if (reg->type == VPU_DEC || reg->type == VPU_DEC_PP) { + if ((reg->type == VPU_DEC || reg->type == VPU_DEC_PP) && + data->hw_id != HEVC_ID) { if (reg_check_fmt(reg) == VPU_DEC_FMT_H264) { if (reg_probe_width(reg) > 2560) { /*