From nobody Sun Oct 5 05:28:58 2025 Received: from smtp.forwardemail.net (smtp.forwardemail.net [121.127.44.73]) (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 822B1286898 for ; Sun, 10 Aug 2025 21:26:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=121.127.44.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754861173; cv=none; b=k3/VacdUp3d0wCxh+TuOg6atEXsaKP47jWBxQtD6PGaltlHl5qYkaDz4vHPUiO9J33gX9Sqx34kFY1l/1VEwU2MwAjuVshHxQKfBvNr2TG9B9KV3VQ5wmUfEnGRBX4EULSmYJ/NKW98c5yc+OISiRIc16bLc2IcTwP93ZGZomMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754861173; c=relaxed/simple; bh=ca7TZL84pkQlUUk0w8WX6/8qkMHUjtCkt3b7BX4YX60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7aNqJvMolNphaNQAh1X9LqMrs0pj4Y3bwmQ8TwDvkcBsKIZIRXNhFLElpAb34LpRfSqMgNHZ6/OuUay0Y4Xv0v9V3F14c87mq2SQn6ZFjbsxK64uXFqZko8V/eErGI1ELldV/zKkktDRlLUBA41Yz5c4y39I7ArvJxw9fyAm4w= 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=DAG6a+UN; arc=none smtp.client-ip=121.127.44.73 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="DAG6a+UN" 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=1754861164; bh=PimwDS8LC37CYWaFf7XT6w/idZMKOZ2fzD26lIMQhVg=; b=DAG6a+UNAXjj0V8JIo6ZDnOmc8z3T7DtTNmuJHE1LZuwYPkW5j8c02IAQ+EMRO5cFyqGEfafz HQwkBE8CFfBD/km4U5O0KRQdVXSx1BTvbDwjq77gvyw6I16J6JFmXtu2Q0ZPTW+lGq5zCSAwSPw Cgl12dJZ8EklhrEIHvDufKdNXxZDKtFd+BokTi6F0wrwk+3gh1W1QG8w/6FhcqkqDyjzo1AUu0z 4pMubGUuJ95MQu1KUl2Etau27t8/fyVn0EZL8MCDbCIVuBHL9puV1rLLeCcSnyCNtXzHiG4GzFm h6CgE7uKwLtZ4SAV7JV+rs3/XxCbKgPg6X1rzGbYIUIA== X-Forward-Email-ID: 68990e6b797ab8962779245a X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 121.127.44.73 X-Forward-Email-Version: 1.2.4 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 , Sebastian Fricke , 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 v2 5/7] media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 Date: Sun, 10 Aug 2025 21:24:35 +0000 Message-ID: <20250810212454.3237486-6-jonas@kwiboo.se> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250810212454.3237486-1-jonas@kwiboo.se> References: <20250810212454.3237486-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 v2: - No change --- drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 9 +++++++++ drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h | 2 ++ drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c | 10 ++++++++++ drivers/media/platform/rockchip/rkvdec/rkvdec.c | 12 ++++++++++++ drivers/media/platform/rockchip/rkvdec/rkvdec.h | 4 ++++ 5 files changed, 37 insertions(+) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers= /media/platform/rockchip/rkvdec/rkvdec-hevc.c index 1994ea24f0be..f8bb8c4264f7 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -789,6 +789,15 @@ 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->quirks & RKVDEC_QUIRK_DISABLE_QOS) { + u32 reg; + + reg =3D readl(rkvdec->regs + RKVDEC_REG_QOS_CTRL); + reg |=3D 0xFFFF; + reg &=3D ~BIT(12); + writel(reg, rkvdec->regs + RKVDEC_REG_QOS_CTRL); + } + /* 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..cadb9d592308 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c @@ -824,6 +824,16 @@ 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->quirks & RKVDEC_QUIRK_DISABLE_QOS) { + u32 reg; + + reg =3D readl(rkvdec->regs + RKVDEC_REG_QOS_CTRL); + reg |=3D 0xFFFF; + reg &=3D ~BIT(12); + writel(reg, rkvdec->regs + RKVDEC_REG_QOS_CTRL); + } + /* 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 c20e046205fe..d61d4c419992 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1226,6 +1226,13 @@ 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 { + .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 { .capabilities =3D RKVDEC_CAPABILITY_HEVC | RKVDEC_CAPABILITY_H264 | @@ -1237,6 +1244,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, @@ -1267,6 +1278,7 @@ static int rkvdec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rkvdec); rkvdec->dev =3D &pdev->dev; rkvdec->capabilities =3D variant->capabilities; + rkvdec->quirks =3D variant->quirks; mutex_init(&rkvdec->vdev_lock); INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func); =20 diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.h index 8e1f8548eae4..e633a879e9bf 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 { @@ -69,6 +71,7 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) =20 struct rkvdec_variant { unsigned int capabilities; + unsigned int quirks; }; =20 struct rkvdec_coded_fmt_ops { @@ -121,6 +124,7 @@ struct rkvdec_dev { struct delayed_work watchdog_work; struct iommu_domain *empty_domain; unsigned int capabilities; + unsigned int quirks; }; =20 struct rkvdec_ctx { --=20 2.50.1