From nobody Thu Apr 9 23:26:49 2026 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (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 E7B853CB2DC for ; Thu, 5 Mar 2026 15:38:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772725116; cv=none; b=Qz9VPorwIHGC6Gd9vUbn7vfIilVNQ/gy9xS9xqaV3JC6Uor1EWq0WzOShdu48NDBrPzAGMRemduZ2P78uufp+juuSYNseiPr+HYKMArCubLfxrAb+/+HgS59CNWvhkJrnaOtCvPK10SpZ7rkkDLibEtbeyYiIGR1pE2PcjiEtfs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772725116; c=relaxed/simple; bh=TftMEBdfM6XL72uUy92IWBRj3TzZib7kVM8VptNwVJc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dYdV03bEBviMSGcPSpF7cc+UEAQas3xz6oKoqtMZeY+AIyr336GCz48OQV4X7YJmBqrtiH7xYOv3uB+bAoq209z9GmVzHWSZkvsQ9nVwux5gYVVdKCCNDYqY4qfY5U1tFISu3mTjrMOcQtFjdVft3nOJx3MVwTo15rkccY78D8s= 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.81 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.103.14]) by APP-03 (Coremail) with SMTP id rQCowAC3195so6lpFrziCQ--.13220S6; Thu, 05 Mar 2026 23:38:27 +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 v3 4/4] drm: verisilicon: fill plane's vs_format in atomic_check Date: Thu, 5 Mar 2026 23:38:17 +0800 Message-ID: <20260305153817.157841-5-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260305153817.157841-1-zhengxingda@iscas.ac.cn> References: <20260305153817.157841-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: rQCowAC3195so6lpFrziCQ--.13220S6 X-Coremail-Antispam: 1UD129KBjvJXoWxXw1fCF18Xw47Cr17XF1DWrg_yoW7JF17pr 4DAFyUKr4rArW8Gr9rJw4kta9xuan3GryIgrWkGwnavF15trW3Cw1DJrZ3CFs8JrZrGw4x tanaywsxAw42yF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr 1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r1q6r 43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIx AIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQFxUUUUUU = 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 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 | 35 +++++++++++++------ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/veris= ilicon/vs_plane.c index e92b869fb90ca..902c6f66c975f 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..3d45101838aeb 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -25,17 +25,31 @@ 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 (fb) { + 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 +98,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 +115,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