From nobody Fri Dec 19 13:25:48 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 From nobody Fri Dec 19 13:25:48 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 604392DEA74 for ; Sat, 6 Dec 2025 08:28:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765009704; cv=none; b=htKzQgIOkqK9mBe8Yk9dPAsAj3FQ+3mYjdETkda/87hT7tyFjxe5svdoLcy4dRMPN6DTriBM4gElAJ6jPV4fFUM/YEsOssT3kKltkW2Bh4hfd96yvdcvU/+fo4e6lRRTwnkWK2jRIsIXXCCFRgtFzunJqnBzu2YUeXaqZPh0vXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765009704; c=relaxed/simple; bh=udlem5Z/fXEsPyiXOwoCFhXzyh44uYOwdlmHnhLhlRM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=baLzgSHaweu+Vcb33k6ErZiGCrvm5ZgCMH22a8mV6o3sgIhkKuELOiaoAJ84eP6B0VZCuzv/O1j6a14DK3bHFjhXmoiYmMKv5WIWZOxtFWQAHXT+iTxs+k+H7d+liWdtzuJUNv5hQyW8M1qj02rcBEEiK4LsMAT78XNVxQCajvU= 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=NvWrfxbf; arc=none smtp.client-ip=209.85.128.54 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="NvWrfxbf" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4779a4fc95aso26941405e9.1 for ; Sat, 06 Dec 2025 00:28:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765009701; x=1765614501; 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=j4FBci3+O4afQtw23umY0BKlPjTmvjUx0lyWZ4/itP0=; b=NvWrfxbfvkeumag4dl4Dgzgy2jX65+nmJ25eSFa5bMIZnTX3s9fCoDOZNJ7wnk+3jm gGMjqAOL0Rylaj9uBrjB+EPppycsa7J95B9Jg5InfUvI8TaPbayOXBv1uKAIQa3DqIUS S43w0ZtfMsHGafVtNlZ3qx3H8nBTypfdZkqJPsI6Ti1FpTpFp7UrTg3UqLAO/BGWM36F gwn5Xi5AHjEaFGxTUhPzLQA3YeHi97jwZPfSuAZ4P4e9sizBX6v6khmfBKRTRkqqMqfV yoLqqn5qUrjOLViCgDt7bgHBzkyELpDKMXpkEki8uHnWKKs7aka2X+Mw6W0UrjS6i/1D KOpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765009701; x=1765614501; 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=j4FBci3+O4afQtw23umY0BKlPjTmvjUx0lyWZ4/itP0=; b=el3RSJYINzJIE6/BzN80hxbItk5e1UHh+kutG4oZyEoCq07cKwr1c6NVNZ6NzHQ/SN 8jCu0++yLoSm3MFMhEUNYMl/J7FhM2T5N8dwiTDSPEbid6DVsKEw8vG9c2PGhZjejlmA bpI1mfJvXge7d8GExbG83drP7tsRhAl9i/ZqRyvAtHfusvmW1UdQG7O0V0jy5GupjoYy 3+psevv2x9aIG6Anjr+RJeXEAX+eHI2Npg3Z8NE7/e775AdwbfHeAbDB+6spqEaM43km +UQqu1o5zq2iihZUd618/fkXOoC0Bza1UmFexG52m99zV8U8QZoCF6aTDYtN8naMf1cF bRyQ== X-Forwarded-Encrypted: i=1; AJvYcCXat59WnbPrpVmFuvEcfiFUJv1eVQh2W4nb4p+UljuA8aM0AaWo/53loJhbhWj38xDT6ZWDA8pGzZpA2AU=@vger.kernel.org X-Gm-Message-State: AOJu0Yypxn0BVSNAwl+ATzElLvITSA4yLB0c5g8bIiIBzLogMQHHaKiv C2hdaAWMtO2IyMLOgMbSa2a2fyTiyVkQ5URZX7WR2xpgdVnIr3a/6clj X-Gm-Gg: ASbGncs/XDyGjogfaT9Vt69+FMFN5UHh7ksJxHFqjiayT/XeHI6iNAPoEL3us2FtZQD KLmbOWUIH4rRN1+W0xVrNp/RIgNG9yMIFg/6ez5U3PvDz/z0Y3jkBz9iZXP6+zfCucRtagb7Yit KRKbWUDXW77QD0XWOnnhxwUe+fQrLzwXFMzsXTv0761fcuKkDzDqO76evoIF0cBBllKjmtE/CU/ lo+q96wXbgsoNI5Rh2TpaXZWM1rNecHWSkvUhTT25DtKVDSzRl1xLdO9UwYqIB4HkK/XiZlogVY YJGro3E6JN2+8HGy5x199bltAYny877u1Bt1WVdopMW1njTYfChmaoWd3cEjCN9O8SQ/raHMqcr JBMFvIaBv+SKL1IzLOTirF2CpwWgw9csRYnjHXcSZpIz0HcFrwez8C0Sa95AJNLFjsh0XeIaYlz SrHrUcDNT9TQjo0dw= X-Google-Smtp-Source: AGHT+IGduH610rn5UO5W1I+quoffTQLyEbtEowPhpEB04wS1de/RlDICAj847j9oMdvdQqNq4Iisag== X-Received: by 2002:a05:600c:a08:b0:471:5c0:94fc with SMTP id 5b1f17b1804b1-47939dfa053mr22028575e9.6.1765009700413; Sat, 06 Dec 2025 00:28:20 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6d9dsm123094705e9.2.2025.12.06.00.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Dec 2025 00:28:20 -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 2/4] media: dt-bindings: rockchip: Add RK3568 Video Decoder bindings Date: Sat, 6 Dec 2025 08:28:07 +0000 Message-Id: <20251206082809.2040679-3-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" The video decoder in RK356X (vdpu346) is described in the same way as the one in RK3588 (vdpu381). A new compatible is added as the decoder capabilities are a subset of the vdpu381 capabilities. Signed-off-by: Christian Hewitt Acked-by: Rob Herring (Arm) --- nb: I've chosen to us rk3568-vdec not rk356x-vdec as other compatibles for these chips are using rk3568. Documentation/devicetree/bindings/media/rockchip,vdec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml b/D= ocumentation/devicetree/bindings/media/rockchip,vdec.yaml index 809fda45b3bd..656ceb1f116e 100644 --- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml @@ -18,6 +18,7 @@ properties: oneOf: - const: rockchip,rk3288-vdec - const: rockchip,rk3399-vdec + - const: rockchip,rk3568-vdec - const: rockchip,rk3576-vdec - const: rockchip,rk3588-vdec - items: @@ -107,6 +108,7 @@ allOf: compatible: contains: enum: + - rockchip,rk3568-vdec - rockchip,rk3576-vdec - rockchip,rk3588-vdec then: --=20 2.34.1 From nobody Fri Dec 19 13:25:48 2025 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 B8E584C6D for ; Sat, 6 Dec 2025 10:15:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765016152; cv=none; b=StbymMo4KkVsYi61h0DOe+LzgrKQEOGWoN2TlCK0GtLtK7s7DuplmddrFEiLxTkGrsj9ijsHXhZ9tM8d4yoQhWcAk1wxfprFDHr4TrJ3Umtd5MVy9vs8lo9rIEA+qJf4e6f556iOeSD7LtcZ2sG7hDnOeC168vUUJWu2GXWGuHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765016152; c=relaxed/simple; bh=m5XQ03NkmU7Dyvrl3uNqx25v8w2wEU616h/uh5i28kk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YI+1vXe3pskeC0fXpyOVX87kPVlG2EomJ+QnhcwiFCeRX3kgu/D/aXqYeE8IkSbOnawHpG3cQaO10kGwPgBnCOF4Hmv0DIVw8ynIyAdwvJU+DIfLCKm/ZDNWXxiFVMnmTZQV0NcHlx+9jvhy0MuY8mj9ObFvbE6JTxipt3SubrU= 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=lj0Ng4fH; arc=none smtp.client-ip=209.85.208.174 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="lj0Ng4fH" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-37a5bc6b491so25623511fa.0 for ; Sat, 06 Dec 2025 02:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765016149; x=1765620949; 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=HePzOK2YwREM++8Zxr7PF7Xhi3Zuwv6TtIklSs2K0TA=; b=lj0Ng4fHhKyZnffsFWOyUdxN9mhGhuk5YVdeCuAExYYHc77gzDxiDHvkZYVme3b2Tf 9q9svmFjPIKAhZC69QsBLOo2Ks4Qi0hNDtU0dquUbqUGJS7SVi2LvFJAh2mvfXvUkBIQ 8M9ngVuAgZALxqmxJex/lSPXHRQs9b6/JHTLv2Fwv49LjtA5n7ybhnsansYUqwVzSae4 e+rWWl1GOxMA/7RQwFW6Vvc2bOc8dDq/5qflpbK0AwntN8ZfQGj3zLaID+lFyCxNeva6 4zshJAxvWFeHRJOH1ASTAXRMe/p87Iu5WeowpBbPX+xEekxNAckxJE9GrxnoU5yl34vS Mnjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765016149; x=1765620949; 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=HePzOK2YwREM++8Zxr7PF7Xhi3Zuwv6TtIklSs2K0TA=; b=wSWbmZ2bzPljCXpW5HK2udsJkiVpR+Q0xcskUEhQ+3g2xmWnt3KNe5O2kzpik/7X6c wtmiWvzTYmnEMIz08z0ELMluS8wsAB8SQ92zualUY5qUtd+JGC9pDABLgGPn9zofPpem 17w09wpjrdZZgAhMTuAJ5mtwFWU5UslLtSlbglKCCT5NtymbgY5EQOdfvPnivB8vGwhb EE9fN55bPdCOETPlUn2Zs01jqundAshqtZ8d1aaydNbDjJZzdeyPoD+VOnNiS8LRo4D2 cPoot0QZux5kUSkB8dbU9LmBTnbsuExrLcNy+lMNfqZ2iSDeKXx2F72GQqW2nGOakCjt hehA== X-Forwarded-Encrypted: i=1; AJvYcCXfavooFApyniiingFY/+FR4N8o1QtFW4SQM/8S1hdeL5V/MnR7bKJejc0f6S91ViPdQ+JeO2gF+Ydl/A0=@vger.kernel.org X-Gm-Message-State: AOJu0YxWvxP1wjgHnjo0XFv8Z5Lcin93FM5wVzKOmyCjhvrlFQhrF3oL tpLF/JAO0O1R3PREic696eFC4hCD2YK5uaYrKIaIuWoWqc87w/PgkrDKCS8QOroWNrI= X-Gm-Gg: ASbGncstI/490veumG6GzqIAj52oZrbfJD0ZNM8wYq5GRzN4FWDUAPHlwZdGGtYaEEg MRNjvSibRXujWTlT4s6OAxG3iwVvck5DtpAAYhi/Uj6q9TzJHhGZKOlM2q/bKZRWaKBz+Zf2XaZ LjC8MpA8+O5Mcx4UY/Oj9apPg5XxNwWBpHqp7AIm4RjZNMcueLu9lJbZ+OAqD+LLzAS7/+sc0OE WboVmuFSJZ7Ngf5bFb3Ml94J3mhtCY7MRPijdtTJLKINErz7eFIBzXl9YWjxLD0EV1UtOkVLdnB sKP2Fa23VDU7zwtFitrnnVi21FvIf5r6R9DaIKYsgsVcJNyViPHvoqnU/qfk+/WEErSeTK2RhXi cg1lJ7Z552zth8rMsvT9/u028IT14s0Y/QYUvWniiFqoiWxM797EfflIA2hDBqp44AMfo0x0Zgx VvIM3cI+xQG0QAih0= X-Google-Smtp-Source: AGHT+IHZhU14o4ScBHW4P11RxOcWO7E57dLHDLPGPlafHtqW8aK0T9R3cLmmCnbIYLub9+VE97fizQ== X-Received: by 2002:a05:600c:8b0c:b0:477:a219:cdb7 with SMTP id 5b1f17b1804b1-47939c8b376mr21743575e9.0.1765009703680; Sat, 06 Dec 2025 00:28:23 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6d9dsm123094705e9.2.2025.12.06.00.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Dec 2025 00:28:23 -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 3/4] media: rkvdec: Add support for the VDPU346 variant Date: Sat, 6 Dec 2025 08:28:08 +0000 Message-Id: <20251206082809.2040679-4-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" VDPU346 is derived from VDPU381 but with a single core and limited to 4K60 media. It is also limited to H264 L5.1 and omits AV1 and AVS2 capabilities. It is used with RK3566 and RK3568. Signed-off-by: Christian Hewitt --- .../media/platform/rockchip/rkvdec/rkvdec.c | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index a1c02ef3a97c..cf68454b2217 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -295,6 +295,62 @@ static const struct rkvdec_ctrls rkvdec_h264_ctrls =3D= { .num_ctrls =3D ARRAY_SIZE(rkvdec_h264_ctrl_descs), }; =20 +static const struct rkvdec_ctrl_desc vdpu346_hevc_ctrl_descs[] =3D { + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_DECODE_PARAMS, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_SPS, + .cfg.ops =3D &rkvdec_ctrl_ops, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_PPS, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_SCALING_MATRIX, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_DECODE_MODE, + .cfg.min =3D V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED, + .cfg.max =3D V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED, + .cfg.def =3D V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_START_CODE, + .cfg.min =3D V4L2_STATELESS_HEVC_START_CODE_ANNEX_B, + .cfg.def =3D V4L2_STATELESS_HEVC_START_CODE_ANNEX_B, + .cfg.max =3D V4L2_STATELESS_HEVC_START_CODE_ANNEX_B, + }, + { + .cfg.id =3D V4L2_CID_MPEG_VIDEO_HEVC_PROFILE, + .cfg.min =3D V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, + .cfg.max =3D V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10, + .cfg.menu_skip_mask =3D + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE), + .cfg.def =3D V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, + }, + { + .cfg.id =3D V4L2_CID_MPEG_VIDEO_HEVC_LEVEL, + .cfg.min =3D V4L2_MPEG_VIDEO_HEVC_LEVEL_1, + .cfg.max =3D V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_EXT_SPS_ST_RPS, + .cfg.ops =3D &rkvdec_ctrl_ops, + .cfg.dims =3D { 65 }, + }, + { + .cfg.id =3D V4L2_CID_STATELESS_HEVC_EXT_SPS_LT_RPS, + .cfg.ops =3D &rkvdec_ctrl_ops, + .cfg.dims =3D { 65 }, + }, +}; + +static const struct rkvdec_ctrls vdpu346_hevc_ctrls =3D { + .ctrls =3D vdpu346_hevc_ctrl_descs, + .num_ctrls =3D ARRAY_SIZE(vdpu346_hevc_ctrl_descs), +}; + static const struct rkvdec_ctrl_desc vdpu38x_hevc_ctrl_descs[] =3D { { .cfg.id =3D V4L2_CID_STATELESS_HEVC_DECODE_PARAMS, @@ -449,6 +505,43 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded= _fmts[] =3D { } }; =20 +static const struct rkvdec_coded_fmt_desc vdpu346_coded_fmts[] =3D { + { + .fourcc =3D V4L2_PIX_FMT_H264_SLICE, + .frmsize =3D { + .min_width =3D 64, + .max_width =3D 65520, + .step_width =3D 64, + .min_height =3D 64, + .max_height =3D 65520, + .step_height =3D 16, + }, + .ctrls =3D &rkvdec_h264_ctrls, + .ops =3D &rkvdec_vdpu381_h264_fmt_ops, + .num_decoded_fmts =3D ARRAY_SIZE(rkvdec_h264_decoded_fmts), + .decoded_fmts =3D rkvdec_h264_decoded_fmts, + .subsystem_flags =3D VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF, + .capability =3D RKVDEC_CAPABILITY_H264, + }, + { + .fourcc =3D V4L2_PIX_FMT_HEVC_SLICE, + .frmsize =3D { + .min_width =3D 64, + .max_width =3D 65472, + .step_width =3D 64, + .min_height =3D 64, + .max_height =3D 65472, + .step_height =3D 16, + }, + .ctrls =3D &vdpu346_hevc_ctrls, + .ops =3D &rkvdec_vdpu381_hevc_fmt_ops, + .num_decoded_fmts =3D ARRAY_SIZE(rkvdec_hevc_decoded_fmts), + .decoded_fmts =3D rkvdec_hevc_decoded_fmts, + .subsystem_flags =3D VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF, + .capability =3D RKVDEC_CAPABILITY_HEVC, + }, +}; + static const struct rkvdec_coded_fmt_desc vdpu381_coded_fmts[] =3D { { .fourcc =3D V4L2_PIX_FMT_H264_SLICE, @@ -1654,6 +1747,19 @@ static const struct rkvdec_variant rk3399_rkvdec_var= iant =3D { RKVDEC_CAPABILITY_VP9, }; =20 +static const struct rkvdec_variant rk3568_vdpu346_variant =3D { + .coded_fmts =3D vdpu346_coded_fmts, + .num_coded_fmts =3D ARRAY_SIZE(vdpu346_coded_fmts), + .rcb_sizes =3D vdpu381_rcb_sizes, + .num_rcb_sizes =3D ARRAY_SIZE(vdpu381_rcb_sizes), + .irq_handler =3D vdpu381_irq_handler, + .colmv_size =3D rkvdec_colmv_size, + .flatten_matrices =3D transpose_and_flatten_matrices, + .named_regs =3D true, + .capabilities =3D RKVDEC_CAPABILITY_H264 | + RKVDEC_CAPABILITY_HEVC, +}; + static const struct rkvdec_variant rk3588_vdpu381_variant =3D { .coded_fmts =3D vdpu381_coded_fmts, .num_coded_fmts =3D ARRAY_SIZE(vdpu381_coded_fmts), @@ -1693,6 +1799,10 @@ static const struct of_device_id of_rkvdec_match[] = =3D { .compatible =3D "rockchip,rk3399-vdec", .data =3D &rk3399_rkvdec_variant, }, + { + .compatible =3D "rockchip,rk3568-vdec", + .data =3D &rk3568_vdpu346_variant, + }, { .compatible =3D "rockchip,rk3588-vdec", .data =3D &rk3588_vdpu381_variant, --=20 2.34.1 From nobody Fri Dec 19 13:25:48 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 0569325F98A for ; Sat, 6 Dec 2025 08:28:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765009710; cv=none; b=hOu4cR/jhOe55T6xGp7CFIB1QiFfPfU1UgOUx+3uPIFtbTNQbVqvYC3kmlIHaduUdyIau9OZ4h5/N0m8SHsqUk532tt4UANInedrlQT2aIS9mg78KU3FGrge4BA2N2LDTdG1fug4RV3Tjo8E+elSRdZvQLbbrLevniYAmU/3ysw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765009710; c=relaxed/simple; bh=jbPQQXxbTlq8NK0YN2JEkDKUTfuPh1hTpIy/tr0wqqI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pFE1N3mRiicB4XECcQOG/2h0LT3v6n+bxNrDKxK91wHIk4OCeNokSpJc0jXsoE0uesE8P06KDOYTuz+8t0GkuGUzdsdXr2u6oTQPqkt3k9hUgwbMJ/4jTsAqaYADGNbvGqCLHeJS0Ajd6xDs5B220eu/duN+IPzSH7fPq57Va2k= 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=d0fgrzCh; arc=none smtp.client-ip=209.85.128.42 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="d0fgrzCh" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-477a219dbcaso31096135e9.3 for ; Sat, 06 Dec 2025 00:28:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765009707; x=1765614507; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ybnktA7yiPw4tJvX7FdmF5g8bI2fRM90QpenRWrGzHw=; b=d0fgrzChz1rDKzisGaiQR1BvEpjQ5WGEaUTMkfP6BnwU1Xi/L3se4SYaJjRzSOpFGz I1mkiFVOqvG5LYaJAofCOPt5t40B/3P2H2MiaywS8gBotTOJ6jDowN5i0P2WEYdvyE8D jbI3qxQ6sySXSDtfI/2200Wkf1Poq+hAfFfKlzOuhbpUNeuzXPECT0c8RVlZzkP1VGsU 4zM+yLvoMANTh5wgp94p1UPIwD5msPq25F6y2L8CSN+2OujDj2oLEJamThcKbgeGS4M+ jgBHRTaTaWgK6IO1ZBPd4gNog5Tz+XHcwpghFm7cR+Ad9nmEHg7OxSHWW4iTzW4ROlfR AJ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765009707; x=1765614507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ybnktA7yiPw4tJvX7FdmF5g8bI2fRM90QpenRWrGzHw=; b=F7KcKcjhfQU7RRLr0nQVxpNSL/expUZDVSczdJr0YkeJY24TAxRUhtmrD0/5F9CxeA lq70uuvWrL5oWWMppSzUV4BWwjJumuwaja3NJjNXN7x9MWAIgYl/rrcQg/8Fu6aCu3j4 oyKSIt+U6ZGpOVZltORORNnNAA1SFr7VvfjKT+HfizVpk0/r17AKUBLqcw8whRnKg7HD kwKVkWIDfhfJye/g3Bw8A2LlBrcNiAKGNMbEudT1Rw5WIJ7zQxxvnLUrdqK25s1z3mdV HpoAs33YzJJbY2FDsATvWjOmJd6jl05twkS5a3dS2mlT4Zzl+4bCcMFoPi02pOubEI1y hy4w== X-Forwarded-Encrypted: i=1; AJvYcCXHxgtNfEwGvsAYYWv0r2CgL7+KERwaa9+HBCtJ7m35PUvhUUortejBOJrkrEYuDZ2s0FjlrQ0G+vkLK9g=@vger.kernel.org X-Gm-Message-State: AOJu0Ywqh8U3nwDtbFZ8uvhlfYRKKNjatUejF7ACtBsrdQW4e2iEHaJE a1J+IB5S42OIxhX9rm7uZs9rejXV+VrXYRLYnlRYuLNe4Mee5ym0G5oI X-Gm-Gg: ASbGncu1ZNGSiiGM19IrKh/V3RmIBA/jvA02ViAGmwpm9+bhAaZgGaILuyQFw0FL6Mi AM7mIrgoM7p9lWBZmrYUk1xXSvcdj7Ugz8mWHumhBkjtfxBmq5/Ut6YM/h1UeNXa7vkYjCdIeaZ Wjzv/lzLdTNljEfnZeEnGEl8nas5OWwTo+JtGfo15wrEl79AuFCi2zR8dD2YuXnTKmV9ixn77HM X9jnqvr2IOET6K71O/Ehbe4zTJCcJ7bNjBQTTdYZGPQ51KFtQYwdNatEWcg/YqcylXz8xv/u5Iz 7SFGjdeMihPrjL2zdK3LWfWkfSG7n2t68ihjhL2KHNUMX21EEK9SdCAgw1hzewSgDwxtKc4wsmS WwAlOmo7pH28lqQY6cdBbktZD9DDaFY4cTazF2L2L+Nb8FHcGr3QDdID36zXcXH/AYBScAVgtCH Ut4nh+UA1MmTlaZYXPvwmAw7y55w== X-Google-Smtp-Source: AGHT+IF4fUERXjr9/GquO8BnCSUOnAm5kGVyznTwFVQh3KUd4dX0Gabps7xFnP/iqOvdByNlLK3i7g== X-Received: by 2002:a05:600c:3f12:b0:477:c478:46d7 with SMTP id 5b1f17b1804b1-47939e23802mr18875825e9.22.1765009707151; Sat, 06 Dec 2025 00:28:27 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6d9dsm123094705e9.2.2025.12.06.00.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Dec 2025 00:28:26 -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 Cc: Diederik de Haas , Piotr Oniszczuk Subject: [PATCH 4/4] arm64: dts: rockchip: Add the vdpu346 Video Decoders on RK356X Date: Sat, 6 Dec 2025 08:28:09 +0000 Message-Id: <20251206082809.2040679-5-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" Add the vdpu346 Video Decoders to the rk356x-base devicetree to enable support on RK3566 and RK3568 boards. Also add the needed sram and vdec_mmu nodes. Suggested-by: Diederik de Haas Suggested-by: Piotr Oniszczuk Signed-off-by: Christian Hewitt --- arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk356x-base.dtsi index c005135089d4..c51179e13657 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi @@ -383,6 +383,19 @@ usb2phy1_grf: syscon@fdca8000 { reg =3D <0x0 0xfdca8000 0x0 0x8000>; }; =20 + sram@fdcc0000 { + compatible =3D "mmio-sram"; + reg =3D <0x0 0xfdcc0000 0x0 0xb000>; + ranges =3D <0x0 0x0 0xfdcc0000 0xb000>; + #address-cells =3D <1>; + #size-cells =3D <1>; + + vdec_sram: rkvdec-sram@0 { + reg =3D <0x0 0xb000>; + pool; + }; + }; + pmucru: clock-controller@fdd00000 { compatible =3D "rockchip,rk3568-pmucru"; reg =3D <0x0 0xfdd00000 0x0 0x1000>; @@ -619,6 +632,42 @@ vepu_mmu: iommu@fdee0800 { #iommu-cells =3D <0>; }; =20 + vdec: video-codec@fdf80100 { + compatible =3D "rockchip,rk3568-vdec"; + reg =3D <0x0 0xfdf80200 0x0 0x500>, + <0x0 0xfdf80100 0x0 0x100>, + <0x0 0xfdf80700 0x0 0x100>; + reg-names =3D "function", "link", "cache"; + interrupts =3D ; + clocks =3D <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>, + <&cru CLK_RKVDEC_CA>, <&cru CLK_RKVDEC_CORE>, + <&cru CLK_RKVDEC_HEVC_CA>; + clock-names =3D "axi", "ahb", "cabac", "core", "hevc_cabac"; + assigned-clocks =3D <&cru ACLK_RKVDEC>, + <&cru CLK_RKVDEC_CORE>, + <&cru CLK_RKVDEC_CA>, + <&cru CLK_RKVDEC_HEVC_CA>; + assigned-clock-rates =3D <297000000>, <297000000>, + <297000000>, <600000000>; + iommus =3D <&vdec_mmu>; + power-domains =3D <&power RK3568_PD_RKVDEC>; + resets =3D <&cru SRST_A_RKVDEC>, <&cru SRST_H_RKVDEC>, + <&cru SRST_RKVDEC_CA>, <&cru SRST_RKVDEC_CORE>, + <&cru SRST_RKVDEC_HEVC_CA>; + reset-names =3D "axi", "ahb", "cabac", "core", "hevc_cabac"; + sram =3D <&vdec_sram>; + }; + + vdec_mmu: iommu@fdf80800 { + compatible =3D "rockchip,rk3568-iommu"; + reg =3D <0x0 0xfdf80800 0x0 0x40>, <0x0 0xfdf80840 0x0 0x40>; + interrupts =3D ; + clocks =3D <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>; + clock-names =3D "aclk", "iface"; + power-domains =3D <&power RK3568_PD_RKVDEC>; + #iommu-cells =3D <0>; + }; + sdmmc2: mmc@fe000000 { compatible =3D "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc"; reg =3D <0x0 0xfe000000 0x0 0x4000>; --=20 2.34.1