From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B41F1CD3442 for ; Thu, 7 May 2026 07:57:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AD8A10E689; Thu, 7 May 2026 07:57:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="VxkwL996"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="G2QFq4r+"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="VxkwL996"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="G2QFq4r+"; dkim-atps=neutral Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85F7F10EFBD for ; Thu, 7 May 2026 07:57:53 +0000 (UTC) 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-out2.suse.de (Postfix) with ESMTPS id 44D925D5FE; Thu, 7 May 2026 07:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1778140655; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ocn9hZZcjtGQJUOF5X571Jlb5UX2YYs6SbnCPI+QL0M=; b=VxkwL99687E0jSjN7u3cXaTRj/Doryquqh0kMeFqAlaCRemq+JbY+0u50ZvSKyrwQryYRi sFKAq2nECgK/AfApICTr/zRxiPriX9ygRuq6LnU7pTCDLdnohmuwb2z/fvk7KR3a77Aofh 9VemorHtKxW0uHQyZtogOi8/Gy5ZN9A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1778140655; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ocn9hZZcjtGQJUOF5X571Jlb5UX2YYs6SbnCPI+QL0M=; b=G2QFq4r+nvMIECty2O0H+LV9KW3hA6MeWgx/L1Oq2CRgJvicOnamlYyLfmhI9Ed48zeP28 sdf7fqbPOiWrtaDA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1778140655; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ocn9hZZcjtGQJUOF5X571Jlb5UX2YYs6SbnCPI+QL0M=; b=VxkwL99687E0jSjN7u3cXaTRj/Doryquqh0kMeFqAlaCRemq+JbY+0u50ZvSKyrwQryYRi sFKAq2nECgK/AfApICTr/zRxiPriX9ygRuq6LnU7pTCDLdnohmuwb2z/fvk7KR3a77Aofh 9VemorHtKxW0uHQyZtogOi8/Gy5ZN9A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1778140655; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ocn9hZZcjtGQJUOF5X571Jlb5UX2YYs6SbnCPI+QL0M=; b=G2QFq4r+nvMIECty2O0H+LV9KW3hA6MeWgx/L1Oq2CRgJvicOnamlYyLfmhI9Ed48zeP28 sdf7fqbPOiWrtaDA== 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 C4F33593A8; Thu, 7 May 2026 07:57:34 +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 MD2WLu5F/GnZJAAAD6G6ig (envelope-from ); Thu, 07 May 2026 07:57:34 +0000 From: Thomas Zimmermann To: mripard@kernel.org, maarten.lankhorst@linux.intel.com, airlied@redhat.com, airlied@gmail.com, simona@ffwll.ch, admin@kodeit.net, gargaditya08@proton.me, paul@crapouillou.net, zack.rusin@broadcom.com, bcm-kernel-feedback-list@broadcom.com Cc: dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-mips@vger.kernel.org, virtualization@lists.linux.dev, Thomas Zimmermann Subject: [PATCH 09/10] drm/damage-helper: Rename state parameters in damage helpers Date: Thu, 7 May 2026 09:12:28 +0200 Message-ID: <20260507075725.29738-10-tzimmermann@suse.de> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260507075725.29738-1-tzimmermann@suse.de> References: <20260507075725.29738-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; RCPT_COUNT_TWELVE(0.00)[17]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_TO(0.00)[kernel.org,linux.intel.com,redhat.com,gmail.com,ffwll.ch,kodeit.net,proton.me,crapouillou.net,broadcom.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLqqu4k9zio1uathxs7idfp4sa)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Rename some of the state parameters of the damage-helper functions to align them with each other and other helpers. No functional changes. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/drm_damage_helper.c | 20 ++++++++++---------- include/drm/drm_damage_helper.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index 69b08febfe2b..50090fa97534 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -209,7 +209,7 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb); /** * drm_atomic_helper_damage_iter_init - Initialize the damage iterator. * @iter: The iterator to initialize. - * @state: Plane state from which to iterate the damage clips. + * @plane_state: Plane state from which to iterate the damage clips. * * Initialize an iterator, which clips plane damage * &drm_plane_state.fb_damage_clips to plane &drm_plane_state.src. This iterator @@ -225,26 +225,26 @@ EXPORT_SYMBOL(drm_atomic_helper_dirtyfb); */ void drm_atomic_helper_damage_iter_init(struct drm_atomic_helper_damage_iter *iter, - const struct drm_plane_state *state) + const struct drm_plane_state *plane_state) { struct drm_rect src; memset(iter, 0, sizeof(*iter)); - if (!state || !state->crtc || !state->fb || !state->visible) + if (!plane_state || !plane_state->crtc || !plane_state->fb || !plane_state->visible) return; - iter->clips = (struct drm_rect *)drm_plane_get_damage_clips(state); - iter->num_clips = drm_plane_get_damage_clips_count(state); + iter->clips = (struct drm_rect *)drm_plane_get_damage_clips(plane_state); + iter->num_clips = drm_plane_get_damage_clips_count(plane_state); /* Round down for x1/y1 and round up for x2/y2 to catch all pixels */ - src = drm_plane_state_src(state); + src = drm_plane_state_src(plane_state); iter->plane_src.x1 = src.x1 >> 16; iter->plane_src.y1 = src.y1 >> 16; iter->plane_src.x2 = (src.x2 >> 16) + !!(src.x2 & 0xFFFF); iter->plane_src.y2 = (src.y2 >> 16) + !!(src.y2 & 0xFFFF); - if (!iter->clips || state->ignore_damage_clips) { + if (!iter->clips || plane_state->ignore_damage_clips) { iter->clips = NULL; iter->num_clips = 0; iter->full_update = true; @@ -296,7 +296,7 @@ EXPORT_SYMBOL(drm_atomic_helper_damage_iter_next); /** * drm_atomic_helper_damage_merged - Merged plane damage - * @state: Plane state from which to iterate the damage clips. + * @plane_state: Plane state from which to iterate the damage clips. * @rect: Returns the merged damage rectangle * * This function merges any valid plane damage clips into one rectangle and @@ -308,7 +308,7 @@ EXPORT_SYMBOL(drm_atomic_helper_damage_iter_next); * Returns: * True if there is valid plane damage otherwise false. */ -bool drm_atomic_helper_damage_merged(const struct drm_plane_state *state, +bool drm_atomic_helper_damage_merged(const struct drm_plane_state *plane_state, struct drm_rect *rect) { struct drm_atomic_helper_damage_iter iter; @@ -320,7 +320,7 @@ bool drm_atomic_helper_damage_merged(const struct drm_plane_state *state, rect->x2 = 0; rect->y2 = 0; - drm_atomic_helper_damage_iter_init(&iter, state); + drm_atomic_helper_damage_iter_init(&iter, plane_state); drm_atomic_for_each_plane_damage(&iter, &clip) { rect->x1 = min(rect->x1, clip.x1); rect->y1 = min(rect->y1, clip.y1); diff --git a/include/drm/drm_damage_helper.h b/include/drm/drm_damage_helper.h index b765f57c8ccf..eb8f7721dab3 100644 --- a/include/drm/drm_damage_helper.h +++ b/include/drm/drm_damage_helper.h @@ -73,11 +73,11 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb, unsigned int num_clips); void drm_atomic_helper_damage_iter_init(struct drm_atomic_helper_damage_iter *iter, - const struct drm_plane_state *state); + const struct drm_plane_state *plane_state); bool drm_atomic_helper_damage_iter_next(struct drm_atomic_helper_damage_iter *iter, struct drm_rect *rect); -bool drm_atomic_helper_damage_merged(const struct drm_plane_state *state, +bool drm_atomic_helper_damage_merged(const struct drm_plane_state *plane_state, struct drm_rect *rect); #endif -- 2.54.0