From nobody Wed Apr 1 13:57:25 2026 Received: from cstnet.cn (smtp25.cstnet.cn [159.226.251.25]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D84937104A for ; Tue, 31 Mar 2026 06:01:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774936912; cv=none; b=mz1utQrEdVHPgZX39iL2Z2IvMhkg3/lvKKSafLqd0h6xBecMtOwB4Lkk/9/tFwwyrcwQ2SNwmPMTLjvdc6vJBo5UlxhdNdaaajTvqMa3xnemtn/HVAe9mjaoZmCqm515tXxSJC7zILaXgNEXokkDooOI6ZE7CBbEW/sXlVxgAok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774936912; c=relaxed/simple; bh=rBC8mxtKP9lhS/06cQ8gej+EhZq0TdgyFfzm83qRe6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bkXadqmDmNFG/qG4fSjOUMbYTY2GZ836f2wgfWU4TO/80i9yhkIjDVXrGFHc6rh3xL4vChODoQzEPrIk9S/y1DkavDLElZtkHtUj3mVmr64fugIsCtFn5jHEINEk42U3XRLH9HYw5oGDeLNFHB+AgXwCmtjQ4wz88BRK+fwanN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from edelgard.fodlan.icenowy.me (unknown [112.94.100.111]) by APP-05 (Coremail) with SMTP id zQCowAA3yQw8Y8tpZpYFDA--.57367S4; Tue, 31 Mar 2026 14:01:37 +0800 (CST) From: Icenowy Zheng To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Icenowy Zheng Subject: [PATCH drm-misc-next v4 2/4] drm: verisilicon: subclass drm_plane_state Date: Tue, 31 Mar 2026 14:01:24 +0800 Message-ID: <20260331060126.1291966-3-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260331060126.1291966-1-zhengxingda@iscas.ac.cn> References: <20260331060126.1291966-1-zhengxingda@iscas.ac.cn> 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 X-CM-TRANSID: zQCowAA3yQw8Y8tpZpYFDA--.57367S4 X-Coremail-Antispam: 1UD129KBjvJXoWxJF1fuw45KFWftw4DXr18Zrb_yoWrtw15pr srAFy5Kr45Aw4DG3srJw1jya9xua18KryIgrZ7GwnavF15try3uFn5tr93CF43JrW7Gw13 tan2kr4DCr4ayrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBG14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWUtVW8Zw CF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j 6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64 vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0x vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUczV8UUUUU= X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" Create a subclass of drm_plane_state to store hardware-specific state information (e.g. hardware plane format settings) in the future. Signed-off-by: Icenowy Zheng Reviewed-by: Thomas Zimmermann --- Changes in v4: - Add code clearing plane->state pointer after freeing it. - Add Thomas's R-b. Changes in v3: - Switch to drm_WARN_ON(). - Stop to memdup the state. - Move the code freeing the existing plane state to the branch checking whether it's not NULL. - Rename the typecast function to `to_vs_plane_state()`. Changes in v2: - Add the #include clause for atomic state helpers, which was wrongly placed in the previous patch in v1. - Switch to kzalloc_obj helper for allocating the state. drivers/gpu/drm/verisilicon/vs_plane.c | 43 +++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 14 ++++++ .../gpu/drm/verisilicon/vs_primary_plane.c | 6 +-- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/veris= ilicon/vs_plane.c index fa88ed14e41d7..7c6b905c9e1fa 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_plane.c @@ -6,9 +6,11 @@ #include #include =20 +#include #include #include #include +#include =20 #include "vs_plane.h" =20 @@ -124,3 +126,44 @@ dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *= fb, =20 return dma_addr; } + +struct drm_plane_state *vs_plane_duplicate_state(struct drm_plane *plane) +{ + struct vs_plane_state *vs_state; + + if (drm_WARN_ON(plane->dev, !plane->state)) + return NULL; + + vs_state =3D kzalloc_obj(*vs_state, GFP_KERNEL); + if (!vs_state) + return NULL; + + __drm_atomic_helper_plane_duplicate_state(plane, &vs_state->base); + + return &vs_state->base; +} + +void vs_plane_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state) +{ + __drm_atomic_helper_plane_destroy_state(state); + kfree(state); +} + +/* Called during init to allocate the plane's atomic state. */ +void vs_plane_reset(struct drm_plane *plane) +{ + struct vs_plane_state *vs_state; + + if (plane->state) { + __drm_atomic_helper_plane_destroy_state(plane->state); + kfree(plane->state); + plane->state =3D NULL; + } + + vs_state =3D kzalloc_obj(*vs_state, GFP_KERNEL); + if (!vs_state) + return; + + __drm_atomic_helper_plane_reset(plane, &vs_state->base); +} diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index a88cc19f2202e..48ed8fc754d18 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.h +++ b/drivers/gpu/drm/verisilicon/vs_plane.h @@ -63,10 +63,24 @@ struct vs_format { bool uv_swizzle; }; =20 +struct vs_plane_state { + struct drm_plane_state base; +}; + +static inline struct vs_plane_state *to_vs_plane_state(struct drm_plane_st= ate *state) +{ + return container_of(state, struct vs_plane_state, base); +} + int drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format); dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *fb, const struct drm_rect *src_rect); =20 +struct drm_plane_state *vs_plane_duplicate_state(struct drm_plane *plane); +void vs_plane_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state); +void vs_plane_reset(struct drm_plane *plane); + struct drm_plane *vs_primary_plane_init(struct drm_device *dev, struct vs_= dc *dc); =20 #endif /* _VS_PLANE_H_ */ diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/d= rm/verisilicon/vs_primary_plane.c index e8fcb5958615c..bad0bc5e3242d 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -145,10 +145,10 @@ static const struct drm_plane_helper_funcs vs_primary= _plane_helper_funcs =3D { }; =20 static const struct drm_plane_funcs vs_primary_plane_funcs =3D { - .atomic_destroy_state =3D drm_atomic_helper_plane_destroy_state, - .atomic_duplicate_state =3D drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state =3D vs_plane_destroy_state, + .atomic_duplicate_state =3D vs_plane_duplicate_state, .disable_plane =3D drm_atomic_helper_disable_plane, - .reset =3D drm_atomic_helper_plane_reset, + .reset =3D vs_plane_reset, .update_plane =3D drm_atomic_helper_update_plane, }; =20 --=20 2.52.0