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 053E740B362 for ; Wed, 10 Jun 2026 15:26:19 +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=1781105181; cv=none; b=O+DamXJ619BozcgjtFJD5YVhr2cfkW5D+zD/hkmh9Knjb9gTxz396disv76miaMNUMf+yUAzX7tsj6IJJ8BVJJOEz9VSiWlHoHIXl8SrG+xoLdF2jXk8x6WMOU1TxvvOUif2LPtlbuBqgc/R1643wSLmIXU2Iz82pH5a8pY97ww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781105181; c=relaxed/simple; bh=EtB5zUdqQxGY0QLd9me2IGQntms8ZG2oiNylF+JVeEQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aSY4QX4oWvp4fIVQKhRf3ixWoZFMMcAZ3Cz0mdrxjun6HDWIW5Q9rgDxGb+nrdcaAncP1BmgZ+8DQ0ko+sbKTqV5vTC0FWOF3rIFJUMbeZll/7Ly6f40lJ8d+5ydwynQMlPLQ4UHb9qPTR9aj2cWBdEXcmVS5P9jsn6dc9S/arA= 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=LErn801m; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=/gj2oqwe; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=LErn801m; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=/gj2oqwe; 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="LErn801m"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="/gj2oqwe"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="LErn801m"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="/gj2oqwe" 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 344C76AED7; Wed, 10 Jun 2026 15:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1781105125; 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=y5UtJ6eV6iOSreVQ99DfSSH13XZuuKC0qy/3UHtKhSU=; b=LErn801mgf0Wj2MbLzMjH9WR8A2GfoXtHgvC4Kgg5XcqnGRLO4WucHIqSMIrl9LtfjaeJ3 f9JoFG9cSP6BSKsvEq7MmOxOs7hVOJR9ECVZZWlTUHvYhFHKBFiIKfdSB3QFi9ZzPTIQis ulr4+xns++2oB5B/UpyPg9/sEjHHbIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1781105125; 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=y5UtJ6eV6iOSreVQ99DfSSH13XZuuKC0qy/3UHtKhSU=; b=/gj2oqweTBBHd8ryXjO4cluY8v9LaZrF9oBqMR+EgAOTTCUNVGdHRhxkxrt1O82U3YVqhq Wx/f6dDn0M5okzCQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1781105125; 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=y5UtJ6eV6iOSreVQ99DfSSH13XZuuKC0qy/3UHtKhSU=; b=LErn801mgf0Wj2MbLzMjH9WR8A2GfoXtHgvC4Kgg5XcqnGRLO4WucHIqSMIrl9LtfjaeJ3 f9JoFG9cSP6BSKsvEq7MmOxOs7hVOJR9ECVZZWlTUHvYhFHKBFiIKfdSB3QFi9ZzPTIQis ulr4+xns++2oB5B/UpyPg9/sEjHHbIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1781105125; 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=y5UtJ6eV6iOSreVQ99DfSSH13XZuuKC0qy/3UHtKhSU=; b=/gj2oqweTBBHd8ryXjO4cluY8v9LaZrF9oBqMR+EgAOTTCUNVGdHRhxkxrt1O82U3YVqhq Wx/f6dDn0M5okzCQ== 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 6098A779A9; Wed, 10 Jun 2026 15:25:24 +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 +JMmFuSBKWr3HwAAD6G6ig (envelope-from ); Wed, 10 Jun 2026 15:25:24 +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, jani.nikula@linux.intel.com, mhklkml@zohomail.com, zack.rusin@broadcom.com, bcm-kernel-feedback-list@broadcom.com, harry.wentland@amd.com, sunpeng.li@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, rodrigo.vivi@intel.com, joonas.lahtinen@linux.intel.com, tursulin@ursulin.net, javierm@redhat.com, dmitry.osipenko@collabora.com, gurchetansingh@chromium.org, olvaffe@gmail.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, amd-gfx@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH v5 15/15] drm/vmwgfx: Remove unused field struct vmwgfx_du_update_plane.old_state Date: Wed, 10 Jun 2026 17:18:31 +0200 Message-ID: <20260610152505.260172-16-tzimmermann@suse.de> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610152505.260172-1-tzimmermann@suse.de> References: <20260610152505.260172-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Flag: NO X-Spam-Score: -6.79 X-Spamd-Result: default: False [-6.79 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.19)[-0.942]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:mid]; RCPT_COUNT_TWELVE(0.00)[31]; 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,zohomail.com,broadcom.com,amd.com,igalia.com,intel.com,ursulin.net,collabora.com,chromium.org]; 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(RLq3cifbxyhc6qbbynzfc6amns)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Spam-Level: Plane updates no longer require the old plane state. Remove the field from struct vmwgfx_du_update_plane and fix all callers. Signed-off-by: Thomas Zimmermann Reviewed-by: Zack Rusin Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 -- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 12 ++---------- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 11 ++--------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index 2224d7d91d1b..8c2072b82062 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -19,7 +19,6 @@ /** * struct vmw_du_update_plane - Closure structure for vmw_du_helper_plane_update * @plane: Plane which is being updated. - * @old_state: Old state of plane. * @dev_priv: Device private. * @du: Display unit on which to update the plane. * @vfb: Framebuffer which is blitted to display unit. @@ -102,7 +101,6 @@ struct vmw_du_update_plane { struct drm_rect *bb); struct drm_plane *plane; - struct drm_plane_state *old_state; struct vmw_private *dev_priv; struct vmw_display_unit *du; struct vmw_framebuffer *vfb; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index c83061cf7455..fa84bc7ab5bb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -530,7 +530,6 @@ static uint32_t vmw_stud_bo_post_clip(struct vmw_du_update_plane *update, */ static int vmw_sou_plane_update_bo(struct vmw_private *dev_priv, struct drm_plane *plane, - struct drm_plane_state *old_state, struct vmw_framebuffer *vfb, struct vmw_fence_obj **out_fence) { @@ -538,7 +537,6 @@ static int vmw_sou_plane_update_bo(struct vmw_private *dev_priv, memset(&bo_update, 0, sizeof(struct vmw_du_update_plane_buffer)); bo_update.base.plane = plane; - bo_update.base.old_state = old_state; bo_update.base.dev_priv = dev_priv; bo_update.base.du = vmw_crtc_to_du(plane->state->crtc); bo_update.base.vfb = vfb; @@ -692,7 +690,6 @@ static uint32_t vmw_sou_surface_post_clip(struct vmw_du_update_plane *update, */ static int vmw_sou_plane_update_surface(struct vmw_private *dev_priv, struct drm_plane *plane, - struct drm_plane_state *old_state, struct vmw_framebuffer *vfb, struct vmw_fence_obj **out_fence) { @@ -700,7 +697,6 @@ static int vmw_sou_plane_update_surface(struct vmw_private *dev_priv, memset(&srf_update, 0, sizeof(struct vmw_du_update_plane_surface)); srf_update.base.plane = plane; - srf_update.base.old_state = old_state; srf_update.base.dev_priv = dev_priv; srf_update.base.du = vmw_crtc_to_du(plane->state->crtc); srf_update.base.vfb = vfb; @@ -721,7 +717,6 @@ static void vmw_sou_primary_plane_atomic_update(struct drm_plane *plane, struct drm_atomic_commit *state) { - struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state, plane); struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane); struct drm_crtc *crtc = new_state->crtc; struct vmw_fence_obj *fence = NULL; @@ -734,12 +729,9 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane, vmw_framebuffer_to_vfb(new_state->fb); if (vfb->bo) - ret = vmw_sou_plane_update_bo(dev_priv, plane, - old_state, vfb, &fence); + ret = vmw_sou_plane_update_bo(dev_priv, plane, vfb, &fence); else - ret = vmw_sou_plane_update_surface(dev_priv, plane, - old_state, vfb, - &fence); + ret = vmw_sou_plane_update_surface(dev_priv, plane, vfb, &fence); if (ret != 0) DRM_ERROR("Failed to update screen.\n"); } else { diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c index f0df2b1c8465..474e3badb80f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@ -1240,7 +1240,6 @@ vmw_stdu_bo_populate_update_cpu(struct vmw_du_update_plane *update, void *cmd, */ static int vmw_stdu_plane_update_bo(struct vmw_private *dev_priv, struct drm_plane *plane, - struct drm_plane_state *old_state, struct vmw_framebuffer *vfb, struct vmw_fence_obj **out_fence) { @@ -1248,7 +1247,6 @@ static int vmw_stdu_plane_update_bo(struct vmw_private *dev_priv, memset(&bo_update, 0, sizeof(struct vmw_du_update_plane_buffer)); bo_update.base.plane = plane; - bo_update.base.old_state = old_state; bo_update.base.dev_priv = dev_priv; bo_update.base.du = vmw_crtc_to_du(plane->state->crtc); bo_update.base.vfb = vfb; @@ -1350,7 +1348,6 @@ vmw_stdu_surface_populate_update(struct vmw_du_update_plane *update, void *cmd, */ static int vmw_stdu_plane_update_surface(struct vmw_private *dev_priv, struct drm_plane *plane, - struct drm_plane_state *old_state, struct vmw_framebuffer *vfb, struct vmw_fence_obj **out_fence) { @@ -1363,7 +1360,6 @@ static int vmw_stdu_plane_update_surface(struct vmw_private *dev_priv, memset(&srf_update, 0, sizeof(struct vmw_du_update_plane)); srf_update.plane = plane; - srf_update.old_state = old_state; srf_update.dev_priv = dev_priv; srf_update.du = vmw_crtc_to_du(plane->state->crtc); srf_update.vfb = vfb; @@ -1424,12 +1420,9 @@ vmw_stdu_primary_plane_atomic_update(struct drm_plane *plane, DRM_ERROR("Failed to bind surface to STDU.\n"); if (vfb->bo) - ret = vmw_stdu_plane_update_bo(dev_priv, plane, - old_state, vfb, &fence); + ret = vmw_stdu_plane_update_bo(dev_priv, plane, vfb, &fence); else - ret = vmw_stdu_plane_update_surface(dev_priv, plane, - old_state, vfb, - &fence); + ret = vmw_stdu_plane_update_surface(dev_priv, plane, vfb, &fence); if (ret) DRM_ERROR("Failed to update STDU.\n"); } else { -- 2.54.0