From nobody Mon Feb 9 23:15:08 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31AB62066C0; Fri, 10 Jan 2025 05:39:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736487596; cv=none; b=sPcN+vHF3gNKISr31/o7jHhJEn8XrkcO6YoUd6nRcz82gjjDOXTDhHrnfYwdvOhXDkDi38YhkwQ365ojkjUMWf2HODvoHsOJ8IdlxflypuuQ+n3A7vsi6QvrJgLNA0jkOHCuuXwvLNj9lEH4wngjJVzqmHKamnC9hLrRdOyKR3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736487596; c=relaxed/simple; bh=CP9UbudAqwoBvCWySj8azYf9NNwJceXOZUXEJzaPRD4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ukoC0vHubF4ETZfXta5/H8lPZQEv8mxicl7bzNr/F0LhTQINgkLGVx7UJOaLJAhlDRu6GBIsAzCtky2QBhqDlo6Bd95QQWiAnCXAGW8N2iKbFb4rpFlcuGgO4Wq3slKGBrsEPdy6bLBi1X5Be8p9TJ5RpPiUGhGclPNaAtAbSSg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=id1I4Q2C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="id1I4Q2C" Received: by smtp.kernel.org (Postfix) with ESMTPS id CD879C4CEE8; Fri, 10 Jan 2025 05:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736487595; bh=CP9UbudAqwoBvCWySj8azYf9NNwJceXOZUXEJzaPRD4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=id1I4Q2CyehVxdl+J5Kf691m43AgsAeAmgLCFFGpRkDwRbm8TbQxxOAequPlwitWv 7GKylUO5jRblb5WaWdw1MYOY4cXEJFmV5ONt/7cVKtU5hK8usuxCP8ZrSwVd3je0Ub OzCyjuv83JSC0ag3zDScS/iYo1BIkChJkA3g0sr/ai+5phF/UZAB3S+eNekPYDtSBb /VMobkVt5Hgkxz5fBO1yBW9duF9nLr6AUGrDVjiPFnPS9mVgr68VxuxaXUcjVCrPEH E2UmzwiotiAbJL2AmUyjWyHC99Y9FpeHg3OrBkrOu1qjxdgCRs386/5sYSjCK5ONyu OD7v7kmx0z5Vw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C54DBE7719C; Fri, 10 Jan 2025 05:39:55 +0000 (UTC) From: Ao Xu via B4 Relay Date: Fri, 10 Jan 2025 13:39:54 +0800 Subject: [PATCH 04/11] drm: meson: add primary and overlay plane support for S4 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250110-drm-s4-v1-4-cbc2d5edaae8@amlogic.com> References: <20250110-drm-s4-v1-0-cbc2d5edaae8@amlogic.com> In-Reply-To: <20250110-drm-s4-v1-0-cbc2d5edaae8@amlogic.com> To: Neil Armstrong , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ao Xu X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1736487593; l=11576; i=ao.xu@amlogic.com; s=20250103; h=from:subject:message-id; bh=4U1UBMlyjt5Zc6sAX/P7YN/CLGBHy2Chyz1U7fL/wAw=; b=KfM82SwD5kqsto6e4i+22SDcOHT4uufvChBuyIrcem90+gp3VyFgl4516CcugzEfx4VNoMC9Z J5aZ9P2h/heBbry2eb5t0V+YNjSMsfDsE6JRTUH91fbxxDc+R7nYKP/ X-Developer-Key: i=ao.xu@amlogic.com; a=ed25519; pk=c0TSXrwQuL4EhPVf3lJ676U27ax2yfFTqmRoseP/fA8= X-Endpoint-Received: by B4 Relay for ao.xu@amlogic.com/20250103 with auth_id=308 X-Original-From: Ao Xu Reply-To: ao.xu@amlogic.com From: Ao Xu Update plane register configurations in the Meson DRM driver to support the Amlogic S4 SoC. These adjustments ensure proper handling of display planes with S4-specific hardware requirements. Signed-off-by: Ao Xu --- drivers/gpu/drm/meson/meson_crtc.c | 90 +++++++++++++++++++++++------= ---- drivers/gpu/drm/meson/meson_overlay.c | 7 ++- drivers/gpu/drm/meson/meson_plane.c | 24 ++++++--- drivers/gpu/drm/meson/meson_registers.h | 16 ++++++ 4 files changed, 102 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/mes= on_crtc.c index d70616da8ce2fd974b57af6aadca5c98fbb88fce..64c7450b7f688d8997e8ad23947= bff3ec6484aff 100644 --- a/drivers/gpu/drm/meson/meson_crtc.c +++ b/drivers/gpu/drm/meson/meson_crtc.c @@ -28,6 +28,7 @@ #include "meson_osd_afbcd.h" =20 #define MESON_G12A_VIU_OFFSET 0x5ec0 +#define MESON_S4_VIU_OFFSET 0xb6c0 =20 /* CRTC definition */ =20 @@ -479,21 +480,60 @@ void meson_crtc_irq(struct meson_drm *priv) writel_relaxed(priv->viu.vd1_if0_gen_reg, priv->io_base + meson_crtc->viu_offset + _REG(VD2_IF0_GEN_REG)); - writel_relaxed(priv->viu.vd1_if0_gen_reg2, - priv->io_base + meson_crtc->viu_offset + - _REG(VD1_IF0_GEN_REG2)); - writel_relaxed(priv->viu.viu_vd1_fmt_ctrl, - priv->io_base + meson_crtc->viu_offset + - _REG(VIU_VD1_FMT_CTRL)); - writel_relaxed(priv->viu.viu_vd1_fmt_ctrl, - priv->io_base + meson_crtc->viu_offset + - _REG(VIU_VD2_FMT_CTRL)); - writel_relaxed(priv->viu.viu_vd1_fmt_w, - priv->io_base + meson_crtc->viu_offset + - _REG(VIU_VD1_FMT_W)); - writel_relaxed(priv->viu.viu_vd1_fmt_w, - priv->io_base + meson_crtc->viu_offset + - _REG(VIU_VD2_FMT_W)); + + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) { + writel_relaxed(priv->viu.vd1_if0_gen_reg2, + priv->io_base + + _REG(VD1_IF0_GEN_REG2_S4)); + writel_relaxed(priv->viu.viu_vd1_fmt_ctrl, + priv->io_base + + _REG(VIU_VD1_FMT_CTRL_S4)); + writel_relaxed(priv->viu.viu_vd1_fmt_ctrl, + priv->io_base + + _REG(VIU_VD2_FMT_CTRL_S4)); + writel_relaxed(priv->viu.viu_vd1_fmt_w, + priv->io_base + + _REG(VIU_VD1_FMT_W_S4)); + writel_relaxed(priv->viu.viu_vd1_fmt_w, + priv->io_base + + _REG(VIU_VD2_FMT_W_S4)); + + writel_relaxed(priv->viu.vd1_range_map_y, + priv->io_base + + _REG(VD1_IF0_RANGE_MAP_Y_S4)); + writel_relaxed(priv->viu.vd1_range_map_cb, + priv->io_base + + _REG(VD1_IF0_RANGE_MAP_CB_S4)); + writel_relaxed(priv->viu.vd1_range_map_cr, + priv->io_base + + _REG(VD1_IF0_RANGE_MAP_CR_S4)); + } else { + writel_relaxed(priv->viu.vd1_if0_gen_reg2, + priv->io_base + meson_crtc->viu_offset + + _REG(VD1_IF0_GEN_REG2)); + writel_relaxed(priv->viu.viu_vd1_fmt_ctrl, + priv->io_base + meson_crtc->viu_offset + + _REG(VIU_VD1_FMT_CTRL)); + writel_relaxed(priv->viu.viu_vd1_fmt_ctrl, + priv->io_base + meson_crtc->viu_offset + + _REG(VIU_VD2_FMT_CTRL)); + writel_relaxed(priv->viu.viu_vd1_fmt_w, + priv->io_base + meson_crtc->viu_offset + + _REG(VIU_VD1_FMT_W)); + writel_relaxed(priv->viu.viu_vd1_fmt_w, + priv->io_base + meson_crtc->viu_offset + + _REG(VIU_VD2_FMT_W)); + + writel_relaxed(priv->viu.vd1_range_map_y, + priv->io_base + meson_crtc->viu_offset + + _REG(VD1_IF0_RANGE_MAP_Y)); + writel_relaxed(priv->viu.vd1_range_map_cb, + priv->io_base + meson_crtc->viu_offset + + _REG(VD1_IF0_RANGE_MAP_CB)); + writel_relaxed(priv->viu.vd1_range_map_cr, + priv->io_base + meson_crtc->viu_offset + + _REG(VD1_IF0_RANGE_MAP_CR)); + } writel_relaxed(priv->viu.vd1_if0_canvas0, priv->io_base + meson_crtc->viu_offset + _REG(VD1_IF0_CANVAS0)); @@ -592,15 +632,7 @@ void meson_crtc_irq(struct meson_drm *priv) _REG(VD2_IF0_LUMA_PSEL)); writel_relaxed(0, priv->io_base + meson_crtc->viu_offset + _REG(VD2_IF0_CHROMA_PSEL)); - writel_relaxed(priv->viu.vd1_range_map_y, - priv->io_base + meson_crtc->viu_offset + - _REG(VD1_IF0_RANGE_MAP_Y)); - writel_relaxed(priv->viu.vd1_range_map_cb, - priv->io_base + meson_crtc->viu_offset + - _REG(VD1_IF0_RANGE_MAP_CB)); - writel_relaxed(priv->viu.vd1_range_map_cr, - priv->io_base + meson_crtc->viu_offset + - _REG(VD1_IF0_RANGE_MAP_CR)); + writel_relaxed(VPP_VSC_BANK_LENGTH(4) | VPP_HSC_BANK_LENGTH(4) | VPP_SC_VD_EN_ENABLE | @@ -692,10 +724,16 @@ int meson_crtc_create(struct meson_drm *priv) return ret; } =20 - if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) { meson_crtc->enable_osd1 =3D meson_g12a_crtc_enable_osd1; meson_crtc->enable_vd1 =3D meson_g12a_crtc_enable_vd1; - meson_crtc->viu_offset =3D MESON_G12A_VIU_OFFSET; + + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) + meson_crtc->viu_offset =3D MESON_S4_VIU_OFFSET; + else + meson_crtc->viu_offset =3D MESON_G12A_VIU_OFFSET; + meson_crtc->enable_osd1_afbc =3D meson_crtc_g12a_enable_osd1_afbc; meson_crtc->disable_osd1_afbc =3D diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/= meson_overlay.c index 7f98de38842bf932ca3388707ec3e2f2c38d97e3..3cf2efa407849d6af9b010a5ad5= 3e611155b6c9f 100644 --- a/drivers/gpu/drm/meson/meson_overlay.c +++ b/drivers/gpu/drm/meson/meson_overlay.c @@ -733,7 +733,12 @@ static void meson_overlay_atomic_disable(struct drm_pl= ane *plane, priv->viu.vd1_enabled =3D false; =20 /* Disable VD1 */ - if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) { + writel_relaxed(0, priv->io_base + _REG(VD1_BLEND_SRC_CTRL)); + writel_relaxed(0, priv->io_base + _REG(VD2_BLEND_SRC_CTRL)); + writel_relaxed(0, priv->io_base + _REG(VD1_IF0_GEN_REG + 0x2db0)); + writel_relaxed(0, priv->io_base + _REG(VD2_IF0_GEN_REG + 0x2db0)); + } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { writel_relaxed(0, priv->io_base + _REG(VD1_BLEND_SRC_CTRL)); writel_relaxed(0, priv->io_base + _REG(VD2_BLEND_SRC_CTRL)); writel_relaxed(0, priv->io_base + _REG(VD1_IF0_GEN_REG + 0x17b0)); diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/me= son_plane.c index b43ac61201f3123e58effa9c4b734c23cfd3d5df..79cfa42af00f34f23993ab4b7af= 8b7bdfb23abce 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -161,7 +161,8 @@ static void meson_plane_atomic_update(struct drm_plane = *plane, =20 /* Check if AFBC decoder is required for this buffer */ if ((meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM) || - meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) && + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) && fb->modifier & DRM_FORMAT_MOD_ARM_AFBC(MESON_MOD_AFBC_VALID_BITS)) priv->viu.osd1_afbcd =3D true; else @@ -181,7 +182,8 @@ static void meson_plane_atomic_update(struct drm_plane = *plane, priv->viu.osd1_blk0_cfg[0] =3D canvas_id_osd1 << OSD_CANVAS_SEL; =20 if (priv->viu.osd1_afbcd) { - if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) { /* This is the internal decoding memory address */ priv->viu.osd1_blk1_cfg4 =3D MESON_G12A_AFBCD_OUT_ADDR; priv->viu.osd1_blk0_cfg[0] |=3D OSD_ENDIANNESS_BE; @@ -205,7 +207,8 @@ static void meson_plane_atomic_update(struct drm_plane = *plane, priv->viu.osd1_blk0_cfg[0] |=3D OSD_OUTPUT_COLOR_RGB; =20 if (priv->viu.osd1_afbcd && - meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4))) { priv->viu.osd1_blk0_cfg[0] |=3D OSD_MALI_SRC_EN | priv->afbcd.ops->fmt_to_blk_mode(fb->modifier, fb->format->format); @@ -357,7 +360,8 @@ static void meson_plane_atomic_update(struct drm_plane = *plane, priv->viu.osd1_blk0_cfg[3] =3D ((dest.x2 - 1) << 16) | dest.x1; priv->viu.osd1_blk0_cfg[4] =3D ((dest.y2 - 1) << 16) | dest.y1; =20 - if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) { priv->viu.osd_blend_din0_scope_h =3D ((dest.x2 - 1) << 16) | dest.x1; priv->viu.osd_blend_din0_scope_v =3D ((dest.y2 - 1) << 16) | dest.y1; priv->viu.osb_blend0_size =3D dst_h << 16 | dst_w; @@ -377,7 +381,8 @@ static void meson_plane_atomic_update(struct drm_plane = *plane, priv->afbcd.format =3D fb->format->format; =20 /* Calculate decoder write stride */ - if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) priv->viu.osd1_blk2_cfg4 =3D meson_g12a_afbcd_line_stride(priv); } @@ -408,7 +413,8 @@ static void meson_plane_atomic_disable(struct drm_plane= *plane, } =20 /* Disable OSD1 */ - if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) writel_bits_relaxed(VIU_OSD1_POSTBLD_SRC_OSD1, 0, priv->io_base + _REG(OSD1_BLEND_SRC_CTRL)); else @@ -439,7 +445,8 @@ static bool meson_plane_format_mod_supported(struct drm= _plane *plane, return true; =20 if (!meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM) && - !meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) + !meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) && + !meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) return false; =20 if (modifier & ~DRM_FORMAT_MOD_ARM_AFBC(MESON_MOD_AFBC_VALID_BITS)) @@ -546,7 +553,8 @@ int meson_plane_create(struct meson_drm *priv) =20 if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM)) format_modifiers =3D format_modifiers_afbc_gxm; - else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) + else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_S4)) format_modifiers =3D format_modifiers_afbc_g12a; =20 ret =3D drm_universal_plane_init(priv->drm, plane, 0xFF, diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meso= n/meson_registers.h index 3d73d00a1f4c64cb90d2ab78f74133311d028197..c62ee8bac272be035e92dbc8e74= 3b2d4f864bc55 100644 --- a/drivers/gpu/drm/meson/meson_registers.h +++ b/drivers/gpu/drm/meson/meson_registers.h @@ -328,6 +328,22 @@ #define VIU_VD2_FMT_CTRL 0x1a88 #define VIU_VD2_FMT_W 0x1a89 =20 +#define VD1_IF0_RANGE_MAP_Y_S4 0x4816 +#define VD1_IF0_RANGE_MAP_CB_S4 0x4817 +#define VD1_IF0_RANGE_MAP_CR_S4 0x4818 +#define VD1_IF0_GEN_REG2_S4 0x4819 +#define VD1_IF0_GEN_REG3_S4 0x481c +#define VIU_VD1_FMT_CTRL_S4 0x481d +#define VIU_VD1_FMT_W_S4 0x481e + +#define VD2_IF0_RANGE_MAP_Y_S4 0x4896 +#define VD2_IF0_RANGE_MAP_CB_S4 0x4897 +#define VD2_IF0_RANGE_MAP_CR_S4 0x4898 +#define VD2_IF0_GEN_REG2_S4 0x4899 +#define VD2_IF0_GEN_REG3_S4 0x489c +#define VIU_VD2_FMT_CTRL_S4 0x489d +#define VIU_VD2_FMT_W_S4 0x489e + /* VIU Matrix Registers */ #define VIU_OSD1_MATRIX_CTRL 0x1a90 #define VIU_OSD1_MATRIX_COEF00_01 0x1a91 --=20 2.43.0