From nobody Fri Dec 19 15:00:25 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 049B322A4F1 for ; Sat, 6 Dec 2025 08:28:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765009700; cv=none; b=AQx6KiLiW8Jf5IvKtCmuEdUqDhQBtBzqG3LYl7HkuTn0Dx4YyJzzCloGbA8NXSkWIJXjtpCZIVAR7Jj8vEE0i//aW3pcrJJb1kPB5HWURrLQ6nUAVfoeqYl1iRYfXXq3cNSkpvnx+7AwSIlayPqu85T2QgqaAFjKTUeIzAkkNyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765009700; c=relaxed/simple; bh=66/0LGwhPBNZZcINEUO9HXjaMhfiwQEPBMwcQigYeNs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XaxkVHNsKgTUU5pck6E6Ak1OqHpTya7ZI24LLAKkGEUYhTLR4uZjtgYCt1t43vTsJG9FxKVwLIZgsJcXuZwBS037G9wiF79Q8vJqjctnOf8YK5QW8yfpi+lbu3OiWZT4qcpYVBITIH+F1hoJl996Cl4WdCbqJrDaz+ZVWPJtgx0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U4zXS4Ps; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U4zXS4Ps" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-47778b23f64so18128795e9.0 for ; Sat, 06 Dec 2025 00:28:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765009697; x=1765614497; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FezSaBLf7wCo5DY/lU0PUbH+WokJ3F83+Nys5IdDnP0=; b=U4zXS4PsbA0EtO0W9mjxmSIT5QT5gv4j0QUBxH0QCPDSrYgvgTKttIpbxwwOx2fBu/ 9oScrDQptH6yewBNwsbIeYd515zpav7J2hFdl3Ct3z5R8sTrZqUk6UsGmVoZIa6+XfaQ LOJxTqndQKXrw+cpX081vTrGcc38aN8q6dBAnrWuRBWgj7vUILrtJ9SWDcohRiJsESQB DjFXfPIH5ZO3s0xvp7mps5gimku0FpTpUcpIfbRPq15Ly+HUWjT83GQLtC6G2yXXwQ2J fWbZ1IrfeajQlDGwAuOzFG6zbajEVPthfyMOIRrY1snDY0q1bC9nkLzSSokEbDDXRds1 rb1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765009697; x=1765614497; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FezSaBLf7wCo5DY/lU0PUbH+WokJ3F83+Nys5IdDnP0=; b=QVa8t8o+Kau50KOD7vsba4Hl9yWG0nq4DwwGb+Cof06Q/1iLnpJdgnXR+9AoJ6cVjG uLxMk1Rxd5D/wvS1UDaaNG0nve6u0uzTzY2SvdnHIvymE/eLXZ0WBJ1YhVG9RdkocSe9 aFAGvGeXwXJVsA44Ef8NQqctt7UlBU2aogBZ3TaOxuSBJ5Zwec4ASWFpjJKFsjxyTCyQ d0UneJKfd5ELqaIOCsAACmBRvigiZRwucqAwWdlBQ8GLzfdaScvpyjnR0hplvdYNOBOn BZEI0+LYWS2zbizKNH9NmdVURW3XFPKVG7GmaYbLRmozXjJFNn6PMma9Ks386gQ2eMSX j6uw== X-Forwarded-Encrypted: i=1; AJvYcCVYsuJnYhUbw8L3vg3PA41eGSl3okkjV7WJBOXYFLByiOwprFBIMey/y/rH/npU32XIhRKDpIsZ2Oq3Tog=@vger.kernel.org X-Gm-Message-State: AOJu0YyzLLESIZ6BkQRkkrCo5QOffcUCD7rhLdZ6ItevbdD3ZdQRI1kI GPjWDfCGyNoIM1zkku0whR0GYRmtqB7JjY8hfU2OMqynnCoYi2oSf9xq X-Gm-Gg: ASbGncuQmmLoVJhFI5lwsbYTh56CxDkdNxusNM0PpAAwoDnkpXvJW9UtbdZ2Ndn9mjA OiB6Ja0vhDh++eybCdfdl1L12yZ2uhR+lEmxhcN5DLskwzknHJ2Zh3yn1I7Du6xMWrtkxMYCMVX hW73Je8AYc3XkH6NEeF/h/jVLt5Fx3g967gdyjPgva0FoadZKEPdBkFeqCzvNV9AVUrxR47cbmR 0CTfuKdyDpED5ubN+DyfiT2UmrxaSJ/G9CAts9haGXBBhTgekx/xtJk4kE76JecQOUhVsFvjAei FyPvHbXrirDa58i68wuBtNCjmh3MXwl0qrDSLiNndg9k4XeWlRYg+NxEjQ5nyln2mDW6zZGfzQz Xo/UC2CgYPHcWSXzgrq8daHjKfb7VwLi9b0cC5KsLryqTL69ra/CFs0CKjlYN+a1e0Lem6KE7EI 87BX2CmCkgIkmvdoE= X-Google-Smtp-Source: AGHT+IEkUrPBcFh97XMz8GJKKpFnTbZn0ROoOhlMrdyTdBPLjuhn+cNwEGqKaQDpj9DV4jFElIFQvw== X-Received: by 2002:a05:600c:1f8d:b0:477:af74:ed64 with SMTP id 5b1f17b1804b1-47939e3d0a6mr13423475e9.27.1765009697222; Sat, 06 Dec 2025 00:28:17 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6d9dsm123094705e9.2.2025.12.06.00.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Dec 2025 00:28:16 -0800 (PST) From: Christian Hewitt To: Detlev Casanova , =?UTF-8?q?Olivier=20Cr=C3=AAte?= , Ezequiel Garcia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Diederik de Haas , Dmitry Osipenko , Thomas Gleixner , Dragan Simic , Chukun Pan , 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 Subject: [PATCH DO-NOT-MERGE 1/4] media: rkvdec: minor fixes for current DETLEV patches Date: Sat, 6 Dec 2025 08:28:06 +0000 Message-Id: <20251206082809.2040679-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251206082809.2040679-1-christianshewitt@gmail.com> References: <20251206082809.2040679-1-christianshewitt@gmail.com> 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" RK3588 TRM Part 1 para 5.5.9 shows RKVDEC_SWREG12_SENCODARY_EN as the register name so the 'secondary' typo looks maybe intentional, but using correct spellings improves code readability. RK3588 TRM Part 1 para 5.4.3 shows RKVDEC_1080P_PIXELS should use 1920x1088 (to be 4px aligned) not 1920x1080. Also correct some H264 references in the H265 driver. Signed-off-by: Christian Hewitt --- .../media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h | 4 ++-- .../media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h b= /drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h index 11b545e9ee7e..7cc6cbb8e549 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h @@ -24,7 +24,7 @@ =20 #define MAX_SLICE_NUMBER 0x3fff =20 -#define RKVDEC_1080P_PIXELS (1920 * 1080) +#define RKVDEC_1080P_PIXELS (1920 * 1088) #define RKVDEC_4K_PIXELS (4096 * 2304) #define RKVDEC_8K_PIXELS (7680 * 4320) #define RKVDEC_TIMEOUT_1080p (0xefffff) @@ -90,7 +90,7 @@ struct rkvdec_vdpu381_regs_common { u32 reserved4 : 7; } reg011; =20 - struct rkvdec_vdpu381_sencodary_en { + struct rkvdec_vdpu381_secondary_en { u32 wr_ddr_align_en : 1; u32 colmv_compress_en : 1; u32 fbc_e : 1; diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b= /drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c index dd7481a4353d..b4fc0d423c16 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c @@ -275,11 +275,11 @@ static void set_pps_ref_pic_poc(struct rkvdec_hevc_sp= s_pps *hw_ps, u32 poc, int static void assemble_hw_pps(struct rkvdec_ctx *ctx, struct rkvdec_hevc_run *run) { - struct rkvdec_hevc_ctx *h264_ctx =3D ctx->priv; + struct rkvdec_hevc_ctx *h265_ctx =3D ctx->priv; const struct v4l2_ctrl_hevc_sps *sps =3D run->sps; const struct v4l2_ctrl_hevc_pps *pps =3D run->pps; const struct v4l2_ctrl_hevc_decode_params *dec_params =3D run->decode_par= ams; - struct rkvdec_hevc_priv_tbl *priv_tbl =3D h264_ctx->priv_tbl.cpu; + struct rkvdec_hevc_priv_tbl *priv_tbl =3D h265_ctx->priv_tbl.cpu; struct rkvdec_hevc_sps_pps *hw_ps; bool tiles_enabled; s32 max_cu_width; @@ -479,7 +479,7 @@ static void config_registers(struct rkvdec_ctx *ctx, =20 memset(regs, 0, sizeof(*regs)); =20 - /* Set H264 mode */ + /* Set HEVC mode */ regs->common.reg008_dec_mode =3D VDPU383_MODE_HEVC; =20 /* Set input stream length */ --=20 2.34.1