From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.142.180.65 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795218247; b=V20ZwN3sBi9efC9SmtdrbxiRcWysDH+dwwrZF+tI5QSkWzDhp5GDL5e5H3vvnugm5KrW fxbwy7X4V5Z1OhosuVHkKbXfNWw1JnMJsKZ81qvQXSif2nf+NTZXAyV8RhgTVConLIDDw xrRf6X1eghvKxMaKH7MGU+XJzPHGICyBmBjwTGkQJ8QbVsouUyJGiCT8zf5yPqKyoXh/2 TZRjrdzXgqM/OA+/TnbWvNt2/F+GQ3eQ6TZYCADdehEeYwz47fWhXCa1jXr+qRgDcQzwV +KkbgrbD8FHMFey1jOjXwIgndrcnGjePXNuJqHmPzdMRq0uZ22Ws29hibn3Pp9he1Jw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795218247; h=DMARC-Filter:Received:Date:From:To:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; bh=XklkwbJvpSMa1UIUNZWOZidyZsUbNUw0lk5xd4FvB3c=; b=yU3zJQ3/Gj7MyheNEbgwIbG10CILnRxVmO4f3jM/YlDbNj8ZsvMltJOBfbHbd+dnHxxS yNId9OGnd2WVv5Dg4VCWM0DEp3f+XtlB2a70AYooatSRuIyBjYs1OP+ABuEjYegOFJWcC OXb9ZrWR88gJLU70VC7Xqv/9p6LZQDWur4qX3nUTR2Me+hxj6Hk7PUOOTPJ0sA/lC1weg lI21A1841KAuYo8iCtr+IHxgASZBrjkk+QixTlP972KlvNa8vGmeZq8jTxzJ0ttVEdpX/ djfg2FgZgfJJRnTSFEJW08Ds81jQLE4Ps8crzdFAvsLcKokrLh+ItlnVH4ASdWxi9SA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.remote-ip=185.142.180.65 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACC98606A338; Fri, 20 Nov 2026 23:44:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org ACC98606A338 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256:X25519MLKEM768) (Exim 4.100.1) (envelope-from ) id 1xUYGt-000000002fz-3IEG; Fri, 20 Nov 2026 23:43:59 +0000 Date: Fri, 20 Nov 2026 23:43:51 +0000 From: Daniel Golle To: Detlev Casanova , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Nicolas Dufresne , Alex Bee , Hans Verkuil , Jonas Karlman , Sebastian Fricke , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/7] media: rkvdec: hevc: cache every short-term RPS set Message-ID: <1628863e476edf7ea506eb269a742449721bbfbd.1795217229.git.daniel@makrotopia.org> References: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: The driver rebuilds the short-term RPS table of the hardware only when the EXT_SPS_ST_RPS control changed, but it compares just the first set with a cached copy. A change in a later set or in the number of sets goes unnoticed, and the hardware keeps the old table. As the cache starts zeroed, a stream whose first set is all zero never gets a table at all. Inter pictures are then decoded with wrong references, as seen with JCT-VC DELTAQP_A_BRCM_4 on an RK3568. Cache all sets together with their number. The control framework limits the number of sets to 64, which is the size of the cache. Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 variant") Cc: stable@vger.kernel.org Signed-off-by: Daniel Golle --- Changes since v1: - Rewrite the commit message - No code change .../platform/rockchip/rkvdec/rkvdec-hevc-common.c | 12 ++++++++---- .../platform/rockchip/rkvdec/rkvdec-hevc-common.h | 9 ++++++++- .../platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 2 +- .../platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c index 3b281c16a75ed..e3449ab0d415b 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c @@ -330,14 +330,17 @@ static void st_ref_pic_set_calculate(struct rkvdec_hevc_run *run, int idx, } static void rkvdec_hevc_prepare_hw_st_rps(struct rkvdec_hevc_run *run, struct rkvdec_rps *rps, - struct v4l2_ctrl_hevc_ext_sps_st_rps *cache) + struct rkvdec_hevc_st_rps_cache *cache) { + u8 num_sets = run->sps->num_short_term_ref_pic_sets; + size_t size; int idx; if (!run->ext_sps_st_rps) return; - if (!memcmp(cache, run->ext_sps_st_rps, sizeof(struct v4l2_ctrl_hevc_ext_sps_st_rps))) + size = num_sets * sizeof(*cache->sets); + if (cache->num_sets == num_sets && !memcmp(cache->sets, run->ext_sps_st_rps, size)) return; struct calculated_rps_st_set *calculated_rps_st_sets = @@ -357,11 +360,12 @@ static void rkvdec_hevc_prepare_hw_st_rps(struct rkvdec_hevc_run *run, struct rk kfree(calculated_rps_st_sets); - memcpy(cache, run->ext_sps_st_rps, sizeof(struct v4l2_ctrl_hevc_ext_sps_st_rps)); + memcpy(cache->sets, run->ext_sps_st_rps, size); + cache->num_sets = num_sets; } void rkvdec_hevc_assemble_hw_rps(struct rkvdec_hevc_run *run, struct rkvdec_rps *rps, - struct v4l2_ctrl_hevc_ext_sps_st_rps *st_cache) + struct rkvdec_hevc_st_rps_cache *st_cache) { rkvdec_hevc_prepare_hw_st_rps(run, rps, st_cache); rkvdec_hevc_assemble_hw_lt_rps(run, rps); diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h index 2a9b7719ab2d5..f6a3dec6ff4ad 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h @@ -35,10 +35,17 @@ #define RKVDEC_RPS_HEVC_SIZE ALIGN(1032 + 64 * 384, 128) +#define RKVDEC_HEVC_MAX_SHORT_TERM_REF_PIC_SETS 64 + struct rkvdec_rps { u32 info[RKVDEC_RPS_HEVC_SIZE / 8 / 4]; } __packed; +struct rkvdec_hevc_st_rps_cache { + struct v4l2_ctrl_hevc_ext_sps_st_rps sets[RKVDEC_HEVC_MAX_SHORT_TERM_REF_PIC_SETS]; + u8 num_sets; +}; + struct rkvdec_hevc_run { struct rkvdec_run base; const struct v4l2_ctrl_hevc_slice_params *slices_params; @@ -65,7 +72,7 @@ void compute_tiles_non_uniform(struct rkvdec_hevc_run *run, u16 log2_min_cb_size u16 width, u16 height, s32 pic_in_cts_width, s32 pic_in_cts_height, u16 *column_width, u16 *row_height); void rkvdec_hevc_assemble_hw_rps(struct rkvdec_hevc_run *run, struct rkvdec_rps *rps, - struct v4l2_ctrl_hevc_ext_sps_st_rps *st_cache); + struct rkvdec_hevc_st_rps_cache *st_cache); void rkvdec_hevc_assemble_hw_scaling_list(struct rkvdec_ctx *ctx, struct rkvdec_hevc_run *run, struct scaling_factor *scaling_factor, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c index db836536e601b..8388421a68a48 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c @@ -117,7 +117,7 @@ struct rkvdec_hevc_priv_tbl { struct rkvdec_hevc_ctx { struct rkvdec_aux_buf priv_tbl; struct v4l2_ctrl_hevc_scaling_matrix scaling_matrix_cache; - struct v4l2_ctrl_hevc_ext_sps_st_rps st_cache; + struct rkvdec_hevc_st_rps_cache st_cache; struct rkvdec_vdpu381_regs_hevc regs; }; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c index c409d21c08598..47f236295f1e5 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c @@ -124,7 +124,7 @@ struct rkvdec_hevc_priv_tbl { struct rkvdec_hevc_ctx { struct rkvdec_aux_buf priv_tbl; struct v4l2_ctrl_hevc_scaling_matrix scaling_matrix_cache; - struct v4l2_ctrl_hevc_ext_sps_st_rps st_cache; + struct rkvdec_hevc_st_rps_cache st_cache; struct vdpu383_regs_h26x regs; }; -- 2.56.1