From nobody Fri Apr 10 01:07:39 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (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 31D6B32D0DE for ; Thu, 5 Mar 2026 08:09:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772698199; cv=none; b=CadPCq2bMMIf1uv6rhZLUTBNgWo2+EeUoSU8EMmmvZwb48lLh/rpu0wHqDiOWHLDxMUlazO2nuSp3n6BUKhlr9eI3KgYfodMqRPJvaiXn19pmMzREe4/WaTEDAduqaQQVPuDIY1vuwbEKyrlLoIFs3l8MOuPPgrxzBCMaZBJPkE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772698199; c=relaxed/simple; bh=Qv5W0JLfjKSLyNJT0jMlpdRzbDjg+tdMoNiomzATqBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YvBpba0ulBMNnLy+Bg9nIuQl9TrRMBegZbCmv2c+BhPIQfk4uvu5juxCTFcJ4W+KkUV9JOsIfjs28wd33ClZ/GZRE+DDRMh03B4eSlIjL2lbLJ1M+OLzpu5/yXtgOIE1mS2TqjW4hCfKANGK2j5JvnAe06ecCJL4NFIn1/CdyHk= 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.21 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-01 (Coremail) with SMTP id qwCowAA33mlMOqlpp6pHCQ--.1877S2; Thu, 05 Mar 2026 16:09:48 +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 v2 3/3] drm: verisilicon: fill plane's vs_format in atomic_check Date: Thu, 5 Mar 2026 16:09:46 +0800 Message-ID: <20260305080947.3656864-1-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> References: <20260305075926.3642501-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: qwCowAA33mlMOqlpp6pHCQ--.1877S2 X-Coremail-Antispam: 1UD129KBjvJXoWxXw1fCF18WryUJFyDWFy5XFb_yoW5Zw1rpr 4DAFyrKr4ftrWUWr9rJr4DtFZxu3Z3GryIgrWDGwnaqF15t343CF1kJrZ3CFs8JrW7Gw4x tanayrnxAw42yaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkG14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWU tVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14 v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkG c2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4U MIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUZYFZUUU UU= 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 --- Changes in v2: - Add non-NULL check for drm_plane_state->fb. drivers/gpu/drm/verisilicon/vs_plane.h | 2 ++ .../gpu/drm/verisilicon/vs_primary_plane.c | 21 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index 12848a72af576..df4b248b52954 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 *state_to_vs_plane_state(struct drm_pl= ane_state *state) diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/d= rm/verisilicon/vs_primary_plane.c index bad0bc5e3242d..ca41c8053ae12 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -25,12 +25,20 @@ 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 state_to_vs_plane_state(new= _plane_state); struct drm_crtc *crtc =3D new_plane_state->crtc; + struct drm_framebuffer *fb =3D new_plane_state->fb; struct drm_crtc_state *crtc_state; + int ret; =20 - if (!crtc) + if (!crtc || !fb) return 0; =20 + ret =3D drm_format_to_vs_format(fb->format->format, + &new_vs_plane_state->format); + if (ret) + return ret; + crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); if (WARN_ON(!crtc_state)) return -EINVAL; @@ -88,11 +96,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 state_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 @@ -105,16 +113,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