From nobody Wed Sep 10 10:58:46 2025 Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 015B2296BD1 for ; Fri, 5 Sep 2025 16:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=149.28.215.223 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757089224; cv=none; b=piEaEl8PWty6ieSpb72IA4GV6ajMhis0P61l8PmDUtPQAFzhRmUe6U6tAdiCpH312q4C+PQznFSaFr3c85RxCQgM8XxJnSQpuf7mblWDH2m63rofKrDTt1dv3/3mgw6GyL6kYZNpgcGK8rpuheJ+5beyqttwQ9Ko76qLlr74fq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757089224; c=relaxed/simple; bh=AmHLufNMcsuxu9d60SAXN1uJb4bXUElgPa1BqWI93KU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WteeMgggdgUxPwMrjQbLMLqRnH9ccLr/3w9OPwV2DO2ajuzqcO5kN+rde7CrhmshwLwlE+VQaksHHqdran9VhXf/+d6PLPpoTsNiDVhpubcZruKmUfUJyChF2OVh2fMrZLcnrACeDGoCP5/3CEvPTp+ogLzMppqTpzMoqcTIJ6c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=ndCcmk96; arc=none smtp.client-ip=149.28.215.223 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="ndCcmk96" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1757089222; bh=ZhaC+ulaf1xOTD0OmHuMFDx2uPJN7rg7I4X0/WJ2j0s=; b=ndCcmk96qjWIFFfcidpuTYuYSsVipX6ZqncX68EcLaGn/XTzXMGVBu8yALFY2DCyspAjRsrAX FUdxT8yVUJ6cblv0FXdjX/lgN6d85rdX4BC52MAMQbzcZ1DUAXMel9LQLI1MX9MQ9z+Sj6ruLRu JidzDrSkeCW6t2ww3m8mPcfdzP4qpFG3/me52y2lMmcglBwzIbvBuc4OIN5VbDx5e4Ijvgsjpgd Sjbwg3yyxFlxnoSIAaYmAMCn+67wqPRBWlDhdVY/0gbPF4M4f0q7s6jXgz6XuqtS53CglA+AGlM y/IIdck8hl1hg8vAPYPxMntQtitiSuEioJQNV/S6d1eg== X-Forward-Email-ID: 68bb0dc290d039a4fd84d663 X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-Forward-Email-Version: 1.2.13 X-Forward-Email-Website: https://forwardemail.net X-Complaints-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Report-Abuse-To: abuse@forwardemail.net From: Jonas Karlman To: Ezequiel Garcia , Detlev Casanova , Mauro Carvalho Chehab , Heiko Stuebner Cc: Alex Bee , Nicolas Dufresne , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH v3 5/7] media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 Date: Fri, 5 Sep 2025 16:19:23 +0000 Message-ID: <20250905161942.3759717-6-jonas@kwiboo.se> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250905161942.3759717-1-jonas@kwiboo.se> References: <20250905161942.3759717-1-jonas@kwiboo.se> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alex Bee The RK3328 VDEC has a HW quirk that require QoS to be disabled when HEVC or VP9 is decoded, otherwise the decoded picture may become corrupted. Add a RK3328 variant with a quirk flag to disable QoS when before decoding is started. Signed-off-by: Alex Bee Signed-off-by: Jonas Karlman --- Changes in v3: - Add rkvdec_quirks_disable_qos() helper to apply qos quirk - Use quirks from rkvdec_variant - Add num_regs field Changes in v2: - No change --- .../platform/rockchip/rkvdec/rkvdec-hevc.c | 3 +++ .../platform/rockchip/rkvdec/rkvdec-regs.h | 2 ++ .../platform/rockchip/rkvdec/rkvdec-vp9.c | 4 ++++ .../media/platform/rockchip/rkvdec/rkvdec.c | 24 +++++++++++++++++++ .../media/platform/rockchip/rkvdec/rkvdec.h | 5 ++++ 5 files changed, 38 insertions(+) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers= /media/platform/rockchip/rkvdec/rkvdec-hevc.c index 9b5cf70188db..fc7e6a260b0a 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -789,6 +789,9 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx) writel(1, rkvdec->regs + RKVDEC_REG_PREF_LUMA_CACHE_COMMAND); writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND); =20 + if (rkvdec->variant->quirks & RKVDEC_QUIRK_DISABLE_QOS) + rkvdec_quirks_disable_qos(ctx); + /* Start decoding! */ reg =3D (run.pps->flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED) ? 0 : RKVDEC_WR_DDR_ALIGN_EN; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h b/drivers= /media/platform/rockchip/rkvdec/rkvdec-regs.h index 540c8bdf24e4..c627b6b6f53a 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h @@ -219,6 +219,8 @@ #define RKVDEC_REG_H264_ERR_E 0x134 #define RKVDEC_H264_ERR_EN_HIGHBITS(x) ((x) & 0x3fffffff) =20 +#define RKVDEC_REG_QOS_CTRL 0x18C + #define RKVDEC_REG_PREF_LUMA_CACHE_COMMAND 0x410 #define RKVDEC_REG_PREF_CHR_CACHE_COMMAND 0x450 =20 diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c b/drivers/= media/platform/rockchip/rkvdec/rkvdec-vp9.c index 0e7e16f20eeb..b4bf01e839ef 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c @@ -824,6 +824,10 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND); =20 writel(0xe, rkvdec->regs + RKVDEC_REG_STRMD_ERR_EN); + + if (rkvdec->variant->quirks & RKVDEC_QUIRK_DISABLE_QOS) + rkvdec_quirks_disable_qos(ctx); + /* Start decoding! */ writel(RKVDEC_INTERRUPT_DEC_E | RKVDEC_CONFIG_DEC_CLK_GATE_E | RKVDEC_TIMEOUT_E | RKVDEC_BUF_EMPTY_E, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index f8cbc7bcfa15..2d7d20653e4c 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -903,6 +903,18 @@ void rkvdec_run_postamble(struct rkvdec_ctx *ctx, stru= ct rkvdec_run *run) v4l2_ctrl_request_complete(src_req, &ctx->ctrl_hdl); } =20 +void rkvdec_quirks_disable_qos(struct rkvdec_ctx *ctx) +{ + struct rkvdec_dev *rkvdec =3D ctx->dev; + u32 reg; + + /* Set undocumented swreg_block_gating_e field */ + reg =3D readl(rkvdec->regs + RKVDEC_REG_QOS_CTRL); + reg &=3D GENMASK(31, 16); + reg |=3D 0xEFFF; + writel(reg, rkvdec->regs + RKVDEC_REG_QOS_CTRL); +} + static void rkvdec_device_run(void *priv) { struct rkvdec_ctx *ctx =3D priv; @@ -1226,6 +1238,14 @@ static const struct rkvdec_variant rk3288_rkvdec_var= iant =3D { .capabilities =3D RKVDEC_CAPABILITY_HEVC, }; =20 +static const struct rkvdec_variant rk3328_rkvdec_variant =3D { + .num_regs =3D 109, + .capabilities =3D RKVDEC_CAPABILITY_HEVC | + RKVDEC_CAPABILITY_H264 | + RKVDEC_CAPABILITY_VP9, + .quirks =3D RKVDEC_QUIRK_DISABLE_QOS, +}; + static const struct rkvdec_variant rk3399_rkvdec_variant =3D { .num_regs =3D 78, .capabilities =3D RKVDEC_CAPABILITY_HEVC | @@ -1238,6 +1258,10 @@ static const struct of_device_id of_rkvdec_match[] = =3D { .compatible =3D "rockchip,rk3288-vdec", .data =3D &rk3288_rkvdec_variant, }, + { + .compatible =3D "rockchip,rk3328-vdec", + .data =3D &rk3328_rkvdec_variant, + }, { .compatible =3D "rockchip,rk3399-vdec", .data =3D &rk3399_rkvdec_variant, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.h index c47457c954e5..566e06fa2b1e 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -26,6 +26,8 @@ #define RKVDEC_CAPABILITY_H264 BIT(1) #define RKVDEC_CAPABILITY_VP9 BIT(2) =20 +#define RKVDEC_QUIRK_DISABLE_QOS BIT(0) + struct rkvdec_ctx; =20 struct rkvdec_ctrl_desc { @@ -70,6 +72,7 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) struct rkvdec_variant { unsigned int num_regs; unsigned int capabilities; + unsigned int quirks; }; =20 struct rkvdec_coded_fmt_ops { @@ -149,6 +152,8 @@ struct rkvdec_aux_buf { void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); void rkvdec_run_postamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); =20 +void rkvdec_quirks_disable_qos(struct rkvdec_ctx *ctx); + extern const struct rkvdec_coded_fmt_ops rkvdec_h264_fmt_ops; extern const struct rkvdec_coded_fmt_ops rkvdec_hevc_fmt_ops; extern const struct rkvdec_coded_fmt_ops rkvdec_vp9_fmt_ops; --=20 2.51.0