From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7CC223C4FF; Mon, 4 May 2026 16:42:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777912962; cv=none; b=JrfLocnzX0UnJAXvven8Rc87tVAe0zeSGWJNdTVeTQCahzQnH+xhMMbnl8zKeD95XyV22iWd661XuRn1bjSQ3J4Kvt8F9miuiciJ57o32TKNb9X0HeGJWAnisqlaCflJSW0Tql8s/r3JefHscY//T0o7MPlHqQ4cVgJ4YYLGeaM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777912962; c=relaxed/simple; bh=x92dCrtj1Xz/Y1c8aBQDwyr3IWFnuu7loZj+174mpQ4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ULcJKusmXkw11vXvWXarKcAVLOzrcrT4W8gZzIGw8HVaCEqqhjbrRDsPzZ5tx7KLhpeesQw7F+kL5MuBFyGQi3zjFL3S8ytXucUhwWCSjG9s2j0DHQ/bMfZmU7ZsI6TdzUMqyM9Z0uFvnKqBeHFKZ5ow8OE74WP1FEgtinal4nc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=R8+5/AW6; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="R8+5/AW6" Received: from killaraus.ideasonboard.com (2001-14ba-703d-e500--2a1.rev.dnainternet.fi [IPv6:2001:14ba:703d:e500::2a1]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 397059C; Mon, 4 May 2026 18:42:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1777912957; bh=x92dCrtj1Xz/Y1c8aBQDwyr3IWFnuu7loZj+174mpQ4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R8+5/AW6TIz6Hirr1Yu5wz1VTvyFqv1PKg0Wr6VFGDp8mpOnmOZbfmT2fhBboOCz3 2qja54WTb8u2RRuAzEOW1EjYDv63b7FXiZEYI98YHyGz8fvDrGHXr+/h6xvwwB67vM TfMvP8g7DCoGCl/5F8i9f4jtMnONzEjHaRIpHIXw= Date: Mon, 4 May 2026 19:42:37 +0300 From: Laurent Pinchart To: Maxime Ripard Cc: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Jonathan Corbet , Shuah Khan , Dmitry Baryshkov , Jyri Sarha , Tomi Valkeinen , Andrzej Hajda , Neil Armstrong , Robert Foss , Jonas Karlman , Jernej Skrabec , Simon Ser , Harry Wentland , Melissa Wen , Sebastian Wick , Alex Hung , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Chen-Yu Tsai , Samuel Holland , Dave Stevenson , =?utf-8?B?TWHDrXJh?= Canal , Raspberry Pi Kernel Maintenance , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Stone , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: Re: [PATCH v3 09/20] drm/atomic-state-helper: Rename __drm_atomic_helper_plane_state_reset() Message-ID: <20260504164237.GL1344263@killaraus.ideasonboard.com> References: <20260424-drm-mode-config-init-v3-0-8b68d9db0d8b@kernel.org> <20260424-drm-mode-config-init-v3-9-8b68d9db0d8b@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260424-drm-mode-config-init-v3-9-8b68d9db0d8b@kernel.org> On Fri, Apr 24, 2026 at 12:18:49PM +0200, Maxime Ripard wrote: > __drm_atomic_helper_plane_state_reset() is used to initialize a newly > allocated drm_plane_state, and is being typically called by the > drm_plane_funcs.reset implementation. > > Since we want to consolidate DRM objects state allocation around the > atomic_create_state callback that will only allocate and initialize a > new drm_plane_state instance, we will need to call > __drm_atomic_helper_plane_state_reset() from both the reset and > atomic_create hooks. > > To avoid any confusion, we can thus rename > __drm_atomic_helper_plane_state_reset() to > __drm_atomic_helper_plane_state_init(). > > Suggested-by: Laurent Pinchart > Reviewed-by: Thomas Zimmermann > Signed-off-by: Maxime Ripard Reviewed-by: Laurent Pinchart > --- > drivers/gpu/drm/drm_atomic_state_helper.c | 12 ++++++------ > drivers/gpu/drm/i915/display/intel_plane.c | 2 +- > include/drm/drm_atomic_state_helper.h | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c > index e1f3d05ad347..285efbf29520 100644 > --- a/drivers/gpu/drm/drm_atomic_state_helper.c > +++ b/drivers/gpu/drm/drm_atomic_state_helper.c > @@ -235,19 +235,19 @@ void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, > kfree(state); > } > EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state); > > /** > - * __drm_atomic_helper_plane_state_reset - resets plane state to default values > + * __drm_atomic_helper_plane_state_init - Initializes the plane state > * @plane_state: atomic plane state, must not be NULL > * @plane: plane object, must not be NULL > * > * Initializes the newly allocated @plane_state with default > - * values. This is useful for drivers that subclass the CRTC state. > + * values. This is useful for drivers that subclass the plane state. > */ > -void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *plane_state, > - struct drm_plane *plane) > +void __drm_atomic_helper_plane_state_init(struct drm_plane_state *plane_state, > + struct drm_plane *plane) > { > u64 val; > > plane_state->plane = plane; > plane_state->rotation = DRM_MODE_ROTATE_0; > @@ -295,11 +295,11 @@ void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *plane_state, > plane->hotspot_y_property, > &val)) > plane_state->hotspot_y = val; > } > } > -EXPORT_SYMBOL(__drm_atomic_helper_plane_state_reset); > +EXPORT_SYMBOL(__drm_atomic_helper_plane_state_init); > > /** > * __drm_atomic_helper_plane_reset - reset state on plane > * @plane: drm plane > * @plane_state: plane state to assign > @@ -313,11 +313,11 @@ EXPORT_SYMBOL(__drm_atomic_helper_plane_state_reset); > */ > void __drm_atomic_helper_plane_reset(struct drm_plane *plane, > struct drm_plane_state *plane_state) > { > if (plane_state) > - __drm_atomic_helper_plane_state_reset(plane_state, plane); > + __drm_atomic_helper_plane_state_init(plane_state, plane); > > plane->state = plane_state; > } > EXPORT_SYMBOL(__drm_atomic_helper_plane_reset); > > diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c > index 5390ceb21ca4..d013d9228d0b 100644 > --- a/drivers/gpu/drm/i915/display/intel_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_plane.c > @@ -65,11 +65,11 @@ > static void intel_plane_state_reset(struct intel_plane_state *plane_state, > struct intel_plane *plane) > { > memset(plane_state, 0, sizeof(*plane_state)); > > - __drm_atomic_helper_plane_state_reset(&plane_state->uapi, &plane->base); > + __drm_atomic_helper_plane_state_init(&plane_state->uapi, &plane->base); > > plane_state->scaler_id = -1; > } > > struct intel_plane *intel_plane_alloc(void) > diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h > index 900672c6ea90..44e8850aae7f 100644 > --- a/include/drm/drm_atomic_state_helper.h > +++ b/include/drm/drm_atomic_state_helper.h > @@ -51,11 +51,11 @@ struct drm_crtc_state * > drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc); > void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state); > void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, > struct drm_crtc_state *state); > > -void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *state, > +void __drm_atomic_helper_plane_state_init(struct drm_plane_state *state, > struct drm_plane *plane); > void __drm_atomic_helper_plane_reset(struct drm_plane *plane, > struct drm_plane_state *state); > void drm_atomic_helper_plane_reset(struct drm_plane *plane); > void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane, > -- Regards, Laurent Pinchart