From nobody Wed Apr 1 12:33:43 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 2D6F319DF6A 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=1774936910; cv=none; b=HrXHOahjzutuIjI0PBCH6AcmcLuTOS/WoBoZZ1hHNHeMWY+DovQAQPMk9TmU2f375nydnNPp7TAux+4kx1mvAfuqETB2yfG2LK4hcy2HS6g70D0gqvufLu+9kDzl0zmS+3TLWJ1CAZgrJUU8NBXAri4ugez7/wYy16WiF5hV0yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774936910; c=relaxed/simple; bh=hxi293s8jG+efT3OQQQwHRlqQm7d4rzBDd/jnT3FNSs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NLT6scVjqK5gpRIRiG4toiENp3jzBsJKdw3T23a37HdIvwMPoXpYwtNeTByHuGnfFXTcI6kCVd5fwxrBMWmT36rc+9qmZ3AzOEZSAKbTMje04QAmb7W/bBJc3TNLOnaz2d/XhJTJYtUtv+GDWQDCESfHJ4vjsjT+YJvgG3zAwns= 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--.57367S3; Tue, 31 Mar 2026 14:01:36 +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 1/4] drm: verisilicon: make vs_format conversion function return int Date: Tue, 31 Mar 2026 14:01:23 +0800 Message-ID: <20260331060126.1291966-2-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--.57367S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr1Utr47XFWrZr45uw47twb_yoW8tFW8pF 47CrZFqFs5tw4aqF9rJayUK343Can5Ja4xWrWkGw1Y9r15KFyUAr15GrWFkr98Gr47Gw1I yFsayr1DZry2kFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBl14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1l84 ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r1q6r43Mx AIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_ Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwI xGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWx JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcV C2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbn2-7UUUUU== X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" This is for further proper invalid drm_format handling before committing the plane state change. The return value is not yet checked yet, and will be checked in atomic_check in the future. Signed-off-by: Icenowy Zheng Reviewed-by: Thomas Zimmermann --- Changes in v4: - Reposition the R-b tag (in v3 it's wrongly placed before SoB). Changes in v3: - Add Thomas's R-b. Changes in v2: - Move a bogus #include clause to the next patch. drivers/gpu/drm/verisilicon/vs_plane.c | 6 ++++-- drivers/gpu/drm/verisilicon/vs_plane.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/veris= ilicon/vs_plane.c index 2f3953e588a34..fa88ed14e41d7 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_plane.c @@ -12,7 +12,7 @@ =20 #include "vs_plane.h" =20 -void drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format) +int drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format) { switch (drm_format) { case DRM_FORMAT_XRGB4444: @@ -62,7 +62,7 @@ void drm_format_to_vs_format(u32 drm_format, struct vs_fo= rmat *vs_format) vs_format->color =3D VSDC_COLOR_FORMAT_A2R10G10B10; break; default: - pr_warn("Unexpected drm format!\n"); + return -EINVAL; } =20 switch (drm_format) { @@ -101,6 +101,8 @@ void drm_format_to_vs_format(u32 drm_format, struct vs_= format *vs_format) =20 /* N/A for non-YUV formats */ vs_format->uv_swizzle =3D false; + + return 0; } =20 dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *fb, diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index 41875ea3d66a5..a88cc19f2202e 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.h +++ b/drivers/gpu/drm/verisilicon/vs_plane.h @@ -63,7 +63,7 @@ struct vs_format { bool uv_swizzle; }; =20 -void drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format); +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 --=20 2.52.0 From nobody Wed Apr 1 12:33:43 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 From nobody Wed Apr 1 12:33:43 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 A033D371072 for ; Tue, 31 Mar 2026 06:01:47 +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=1774936910; cv=none; b=rzVIob4Gdcv/vGpxMS6hbjaWJlyYGEKh75sTZ/M2l/rYHHP9y053QNnJxKCqA3P5yssPfBUvv4vNAKri6tTHuY9ymRnsVevxJi0xU+33ovyglljTBoqJDWDorvOVh1C+yGpK20HiSMd7qwDSrY/vSYS5fUjhRVICUKK1XK7OVHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774936910; c=relaxed/simple; bh=gu7ZdrZaKNpbrOy3XOF8pFlHu6xI116FVTdsU47TYUo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GQwakz7hd2O5DSYgNz+ZRMzj+D5B4xkjj8i55N8lXB4dQCoA9LjXWKU9Xbwi92rwiBERvJHZkbX2wGrfSse+FVk6bHACy2bbV3EMpXPUr1quP+mRNo+vvkJyOceutlO1PfV0oBtAxnOWHmSM493pidvLDrhLBqPtwT0bRVPG/yE= 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--.57367S5; Tue, 31 Mar 2026 14:01:38 +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 3/4] drm: verisilicon: call atomic helper's plane state check even if no CRTC Date: Tue, 31 Mar 2026 14:01:25 +0800 Message-ID: <20260331060126.1291966-4-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--.57367S5 X-Coremail-Antispam: 1UD129KBjvJXoW7AFyDJw18uw45KF4kWw4DArb_yoW8Wr15pr srAFyqgr4rZr4DJasrJw4Dtay3Ca1UKa4Igr97JwsxZFn7tw45WasYyrZ3WF4UJrZFgw1f t34jyFnxAw1jkaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBG14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWUtVW8Zw CF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j 6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64 vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0x vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUHWlkUUUUU= X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" The `drm_atomic_helper_check_plane_state()` helper function needs to be called even if the plane is bound to no CRTCs. Remove the early return in the primary plane's atomic_check, and use NULL for crtc_state in this situation. Fixes: dbf21777caa8 ("drm: verisilicon: add a driver for Verisilicon displa= y controllers") Signed-off-by: Icenowy Zheng Reviewed-by: Thomas Zimmermann --- Changes in v4: - Add Fixed tag. - Add Thomas's R-b. New patch in v3. drivers/gpu/drm/verisilicon/vs_primary_plane.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/d= rm/verisilicon/vs_primary_plane.c index bad0bc5e3242d..421d6f9dc547b 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -26,14 +26,10 @@ static int vs_primary_plane_atomic_check(struct drm_pla= ne *plane, struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); struct drm_crtc *crtc =3D new_plane_state->crtc; - struct drm_crtc_state *crtc_state; + struct drm_crtc_state *crtc_state =3D NULL; =20 - if (!crtc) - return 0; - - crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); - if (WARN_ON(!crtc_state)) - return -EINVAL; + if (crtc) + crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); =20 return drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, --=20 2.52.0 From nobody Wed Apr 1 12:33:43 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 C20E9371043 for ; Tue, 31 Mar 2026 06:01:47 +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=1774936910; cv=none; b=U18drjgmz+q31sMP/uMTNabOdq1ndBHf3bLDmPB2cX4zhs8C3b3Oldniz3h99OE6O2bXgihqur8mzvDsgBGL5E66iDdnsEXfc6poL9T9E01mQVhjZQJ6QUmROgaCDfJRe+X8CWT2QgFVc6UY7lYCgZ0iI7whs2muyOQe6CxW0y0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774936910; c=relaxed/simple; bh=0B/OykefC0CaACzZJR4HfROXlpxzg7TFtLwnAn+2yoE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sNkZRIO7HDH4Ty1knUDuolJAo3RTWt02nBDII6uJwDRIuRNYy/T9SnJP9ZmwNFXUbwvecmi2QfN3NENM+wl1QeriWhIzwjfYtwmaLn4qCRp7uP27Hw2QINEoRHgfPmwaOd6hx2W25tPjXJvBri1Rk36mXd9NVrGFu+sznAD3Uc4= 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--.57367S6; Tue, 31 Mar 2026 14:01:39 +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 4/4] drm: verisilicon: fill plane's vs_format in atomic_check Date: Tue, 31 Mar 2026 14:01:26 +0800 Message-ID: <20260331060126.1291966-5-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--.57367S6 X-Coremail-Antispam: 1UD129KBjvJXoW3XF13JF18Jr45ZFyftrW7twb_yoW7Xr17pr 4DAFy8Kr4rAry8Gr9rJw4kt39xua1fGryIgrWkGwnavF15trW3Cw1DJrZ3CFs8JrZrGw4x tanaywsxAw42yF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr 1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWUtV W8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQFxUUUUUU = X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" Move the conversion from drm_format to vs_format to atomic_check, which is before the point of no return and can properly bail out. Signed-off-by: Icenowy Zheng Reviewed-by: Thomas Zimmermann --- Changes in v4: - Make atomic_check early return if the plane isn't visible. - Added Thomas's R-b. Changes in v3: - Move the code filling vs_format to after drm_atomic_helper_check_plane_st= ate() call. - Add drm_WARN_ON_ONCE when filling vs_format fails. - Add code copying vs_format in vs_plane_duplicate_state (because it no longer memdup's the whole struct vs_plane_state). Changes in v2: - Add non-NULL check for drm_plane_state->fb. drivers/gpu/drm/verisilicon/vs_plane.c | 7 +++- drivers/gpu/drm/verisilicon/vs_plane.h | 2 ++ .../gpu/drm/verisilicon/vs_primary_plane.c | 36 +++++++++++++------ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/veris= ilicon/vs_plane.c index 7c6b905c9e1fa..d81f7b8f4c650 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_plane.c @@ -129,17 +129,22 @@ dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer = *fb, =20 struct drm_plane_state *vs_plane_duplicate_state(struct drm_plane *plane) { - struct vs_plane_state *vs_state; + struct vs_plane_state *vs_state, *vs_state_old; =20 if (drm_WARN_ON(plane->dev, !plane->state)) return NULL; =20 + vs_state_old =3D to_vs_plane_state(plane->state); + vs_state =3D kzalloc_obj(*vs_state, GFP_KERNEL); if (!vs_state) return NULL; =20 __drm_atomic_helper_plane_duplicate_state(plane, &vs_state->base); =20 + memcpy(&vs_state->format, &vs_state_old->format, + sizeof(struct vs_format)); + return &vs_state->base; } =20 diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index 48ed8fc754d18..f18c36ef4cd90 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.h +++ b/drivers/gpu/drm/verisilicon/vs_plane.h @@ -65,6 +65,8 @@ struct vs_format { =20 struct vs_plane_state { struct drm_plane_state base; + + struct vs_format format; }; =20 static inline struct vs_plane_state *to_vs_plane_state(struct drm_plane_st= ate *state) diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/d= rm/verisilicon/vs_primary_plane.c index 421d6f9dc547b..3576dd524f5c4 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -25,17 +25,32 @@ static int vs_primary_plane_atomic_check(struct drm_pla= ne *plane, { struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); + struct vs_plane_state *new_vs_plane_state =3D to_vs_plane_state(new_plane= _state); + struct drm_framebuffer *fb =3D new_plane_state->fb; struct drm_crtc *crtc =3D new_plane_state->crtc; struct drm_crtc_state *crtc_state =3D NULL; + int ret; =20 if (crtc) crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); =20 - return drm_atomic_helper_check_plane_state(new_plane_state, - crtc_state, - DRM_PLANE_NO_SCALING, - DRM_PLANE_NO_SCALING, - false, true); + ret =3D drm_atomic_helper_check_plane_state(new_plane_state, + crtc_state, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, + false, true); + if (ret) + return ret; + + if (!new_plane_state->visible) + return 0; + + ret =3D drm_format_to_vs_format(fb->format->format, + &new_vs_plane_state->format); + if (drm_WARN_ON_ONCE(plane->dev, ret)) + return ret; + + return 0; } =20 static void vs_primary_plane_commit(struct vs_dc *dc, unsigned int output) @@ -84,11 +99,11 @@ static void vs_primary_plane_atomic_update(struct drm_p= lane *plane, { struct drm_plane_state *state =3D drm_atomic_get_new_plane_state(atomic_s= tate, plane); + struct vs_plane_state *vs_state =3D to_vs_plane_state(state); struct drm_framebuffer *fb =3D state->fb; struct drm_crtc *crtc =3D state->crtc; struct vs_dc *dc; struct vs_crtc *vcrtc; - struct vs_format fmt; unsigned int output; dma_addr_t dma_addr; =20 @@ -101,16 +116,15 @@ static void vs_primary_plane_atomic_update(struct drm= _plane *plane, output =3D vcrtc->id; dc =3D vcrtc->dc; =20 - drm_format_to_vs_format(state->fb->format->format, &fmt); - regmap_update_bits(dc->regs, VSDC_FB_CONFIG(output), VSDC_FB_CONFIG_FMT_MASK, - VSDC_FB_CONFIG_FMT(fmt.color)); + VSDC_FB_CONFIG_FMT(vs_state->format.color)); regmap_update_bits(dc->regs, VSDC_FB_CONFIG(output), VSDC_FB_CONFIG_SWIZZLE_MASK, - VSDC_FB_CONFIG_SWIZZLE(fmt.swizzle)); + VSDC_FB_CONFIG_SWIZZLE(vs_state->format.swizzle)); regmap_assign_bits(dc->regs, VSDC_FB_CONFIG(output), - VSDC_FB_CONFIG_UV_SWIZZLE_EN, fmt.uv_swizzle); + VSDC_FB_CONFIG_UV_SWIZZLE_EN, + vs_state->format.uv_swizzle); =20 dma_addr =3D vs_fb_get_dma_addr(fb, &state->src); =20 --=20 2.52.0