From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B515628C037 for ; Thu, 5 Mar 2026 11:37:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772710623; cv=none; b=fu5f0662F65fAiUepGZHto8Z/3rB+nDRK1+SsSau8fB1D1ghLf96LHueSTRKt6c91CJAEu9X5/EG8cMiY7+zYlIZl2iC6YARln7tPtQuYWMBkEhpTW8bPHYzxWC9emjKccqpBwBJq29xIPWfEngVhdrTpA99AxrUUi6+2Jl9D/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772710623; c=relaxed/simple; bh=1P0Hw0tVth/cU1JUPrQ5IYDUYu+k3x0kZmk5rE368/o=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=MaFnGo2zy0QrUd/9/We1S6nxzZDo+ZQitu/t8Dzg48HziAho+3rSLXrmZYrw0XIk58HPvx3+bFMpEUbYK2kvPWitWQrxsC8DER851vMl71paU4w+lbCWu5QXmHkO1mIT9o8iCpv4WVTJvOKyTvkH/IlJilx5wzXBeM6ZBxGeugw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=a6rSGJCC; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=B5Gf7Jie; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=DGZL1j4s; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=TXDx58x7; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="a6rSGJCC"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="B5Gf7Jie"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="DGZL1j4s"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="TXDx58x7" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id F0A0D3F802; Thu, 5 Mar 2026 11:36:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772710620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bwST3sE+5H9nFGA0DwHvdBkskZ7KEGkiTel0eGW0mSM=; b=a6rSGJCC/ma4+NrEltmT5DmRp4GcL8G5uGBLKUzaTuJAJsC1rR8eIoqEZ1tCyBHBOsblYm SqKkGT75hBlhsnftpxufP5g0EA7GQISQl312MbatK2+Ad2+rMTnhyJ6GCKcvGrPmGA6KxG IlIj/sTzD0UqajbUnZrxjU2hyJu+S0Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772710620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bwST3sE+5H9nFGA0DwHvdBkskZ7KEGkiTel0eGW0mSM=; b=B5Gf7JieDcvOtvA0fLisSnDvRn/8A1Tt3hOtYOvesZrDyK+xna6FLsIGr2vMl0UgE81Xy6 dj9LOlmBWgwPUACw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772710619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bwST3sE+5H9nFGA0DwHvdBkskZ7KEGkiTel0eGW0mSM=; b=DGZL1j4sclRr/NYk6ia80LBuZqbZgkVuvY99/atdpTpz/4WWmpVSV+hYVB71/75DiKTip5 THM3U67zUzdGnXLrzZ9KphjJuTSjoRdHRTa+hsvIUZBEE5OlVgJRnyCaqtBEIemglZT+AI 0uJRSPwAba9U03+DlieeVkn1qfgaWdA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772710619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bwST3sE+5H9nFGA0DwHvdBkskZ7KEGkiTel0eGW0mSM=; b=TXDx58x7oDTOPbJS4WaehQLWTwVs/l7gq+yOpxiwBoNHZHA5rbQfBy03hW4IqRvpX2/Zzz bPFXxhE99WicAZAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BAA073EA68; Thu, 5 Mar 2026 11:36:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OIYlLNtqqWkzOgAAD6G6ig (envelope-from ); Thu, 05 Mar 2026 11:36:59 +0000 Message-ID: Date: Thu, 5 Mar 2026 12:36:59 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH drm-misc-next v2 3/3] drm: verisilicon: fill plane's vs_format in atomic_check To: Icenowy Zheng , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng References: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> <20260305080947.3656864-1-zhengxingda@iscas.ac.cn> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: <20260305080947.3656864-1-zhengxingda@iscas.ac.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.995]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_TO(0.00)[iscas.ac.cn,linux.intel.com,kernel.org,gmail.com,ffwll.ch]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[8]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo] X-Spam-Flag: NO X-Spam-Score: -4.30 X-Spam-Level: Hi Am 05.03.26 um 09:09 schrieb Icenowy Zheng: > 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/verisilicon/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 { > > struct vs_plane_state { > struct drm_plane_state base; > + > + struct vs_format format; In case you implement my comment about kzalloc vs kmemdup, don't forget to assign it in the plane-duplicate helper. > }; > > static inline struct vs_plane_state *state_to_vs_plane_state(struct drm_plane_state *state) > diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/drm/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_plane *plane, > { > struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, > plane); > + struct vs_plane_state *new_vs_plane_state = state_to_vs_plane_state(new_plane_state); > struct drm_crtc *crtc = new_plane_state->crtc; > + struct drm_framebuffer *fb = new_plane_state->fb; > struct drm_crtc_state *crtc_state; > + int ret; > > - if (!crtc) > + if (!crtc || !fb) > return 0; I see that even the original code was not correct. You have to call drm_atomic_helper_check_plane_state() in any case. If there's no CRTC, use NULL for the CRTC state. See [1] for an example. > > + ret = drm_format_to_vs_format(fb->format->format, > + &new_vs_plane_state->format); > + if (ret) > + return ret; > + That should also only happen after drm_atomic_helper_check_plane_state().  You can again take the code around [1] for an example. [1] https://elixir.bootlin.com/linux/v7.0-rc1/source/drivers/gpu/drm/ast/ast_mode.c#L504 I think it makes sense to warn once if the conversion fails. After all, the driver should only export DRM formats that it can program to hardware.   if (drm_WARN_ON_ONCE(plane->dev, ret))     return ret; > crtc_state = 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_plane *plane, > { > struct drm_plane_state *state = drm_atomic_get_new_plane_state(atomic_state, > plane); > + struct vs_plane_state *vs_state = state_to_vs_plane_state(state); > struct drm_framebuffer *fb = state->fb; > struct drm_crtc *crtc = state->crtc; > struct vs_dc *dc; > struct vs_crtc *vcrtc; > - struct vs_format fmt; > unsigned int output; > dma_addr_t dma_addr; > > @@ -105,16 +113,15 @@ static void vs_primary_plane_atomic_update(struct drm_plane *plane, > output = vcrtc->id; > dc = vcrtc->dc; > > - drm_format_to_vs_format(state->fb->format->format, &fmt); Removing another possible failure from the atomic commit is really nice. Best regards Thomas > - > 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); > > dma_addr = vs_fb_get_dma_addr(fb, &state->src); > -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)