From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE9E9606A335 for ; Fri, 30 Oct 2026 10:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=c+m2EnOP Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BA2E112728; Fri, 30 Oct 2026 10:29:15 +0000 (UTC) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id F1B06112729 for ; Fri, 30 Oct 2026 10:28:46 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 74A00605CF; Fri, 30 Oct 2026 10:28:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A25FD1F00A18; Fri, 30 Oct 2026 10:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793356126; bh=hYAhdRZ346GdySQVm8ErITnE75pewwTHH/p/a0LZ4bg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=c+m2EnOPb8OK7O4swq2CfBj9Iox+6LlHTZbAr9HaSDJq8HSohtS8Gj74v2LPH7KKg Z7Yd0elZ2zUDwmt3jCSxft4QsQdFq2s/BbuHtfVUeXPIXDj7JMnBQFPQUm1PYkZqTh hViBmH/mXwfhaWCYXuZ7PSXikEVYIMVIQGnelia3S1rP72UoPY/BfrV8NhMifoFNnu FTejHgHUDBctmIerGksjm7dUt9wFsfYC0EbBNTbPh2ArufJvbLHCiO0oYE4nHKRzsN FxeE0OjMBZ5lQR2kdD2JNdZ19TMOE5rygIeny2wHFF8QXAe/0Tk1sfCozdOxNem9l9 a11APFqOe4RPg== From: Maxime Ripard Date: Fri, 30 Oct 2026 11:27:48 +0100 Subject: [PATCH v7 16/16] drm/vkms: Add driver-specific plane property for testing X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261030-drm-reset-state-flag-v7-16-4e55eaeae683@kernel.org> References: <20261030-drm-reset-state-flag-v7-0-4e55eaeae683@kernel.org> In-Reply-To: <20261030-drm-reset-state-flag-v7-0-4e55eaeae683@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Daniel Stone , Harry Wentland , Jocelyn Falempe , =?utf-8?q?Jonas_=C3=85dahl?= , =?utf-8?q?Michel_D=C3=A4nzer?= , Pekka Paalanen , Sebastian Wick , Simon Ser , Victoria Brekenfeld , Xaver Hugl , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5674; i=mripard@kernel.org; h=from:subject:message-id; bh=PzcuUCLqW+hrny0SdJ5K+Atc69gzwY7AsRho41Hd/pk=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFlPCuUOnwpLKtGbtHnn7TsmpU+bvt1zXdJR7dpy5Zn8v jd7ZDMcO6ayMAhzMsiKKbI8kQk7vbx9cZWD/cofMHNYmUCGMHBxCsBEpl5jbPjw9OaG2mdn4u6n NqZMY2p5ydd0e8mUdAcn/7pPzRqPr+WJT9GWVZvf+SXl7teP3/IyOxgbfs6Zt/+xkp7zqZWHuJj 3P6/qW5p66e23wop7WUyaUhfjT7lWb7z++oGWllxAdPA0hZVLAQ== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "dri-devel" X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 The DRM_MODE_ATOMIC_RESET flag allows userspace to reset all object states to their defaults before applying new property values. Testing that this mechanism works correctly requires a property that the test can set to a non-default value and then verify is properly reset. Using a standard property for this is problematic: compositors like Mutter enumerate and track all known properties, making it difficult to isolate the reset behavior from the compositor's own property management. Add a "vkms-test-do-not-use-in-prod" range property to vkms planes. The property is stored in vkms_plane_state, duplicated across state copies, and initialized from its registered default in atomic_create_state via drm_object_property_get_default_value(). Reviewed-by: Daniel Stone Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vkms/vkms_drv.h | 3 ++ drivers/gpu/drm/vkms/vkms_plane.c | 63 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index dea6cad3f1b9..384616095b45 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -147,4 +147,5 @@ struct conversion_matrix { * struct vkms_plane_state must ensure that this pointer is valid * @conversion_matrix: matrix used for yuv formats to convert to rgb + * @vkms_test_do_not_use_value: driver-specific property for testing only */ struct vkms_plane_state { @@ -153,8 +154,10 @@ struct vkms_plane_state { pixel_read_line_t pixel_read_line; struct conversion_matrix conversion_matrix; + unsigned int vkms_test_do_not_use_value; }; struct vkms_plane { struct drm_plane base; + struct drm_property *vkms_test_do_not_use_property; }; diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index fd3d34dcf0fe..42513cb462ac 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -12,8 +12,12 @@ #include #include +#include #include "vkms_drv.h" #include "vkms_formats.h" +#define to_vkms_plane(target) \ + container_of_const(target, struct vkms_plane, base) + static const u32 vkms_formats[] = { DRM_FORMAT_ARGB8888, @@ -55,4 +59,5 @@ static struct drm_plane_state * vkms_plane_duplicate_state(struct drm_plane *plane) { + struct vkms_plane_state *old_state = to_vkms_plane_state(plane->state); struct vkms_plane_state *vkms_state; @@ -61,4 +66,6 @@ vkms_plane_duplicate_state(struct drm_plane *plane) return NULL; + vkms_state->vkms_test_do_not_use_value = old_state->vkms_test_do_not_use_value; + __drm_gem_duplicate_shadow_plane_state(plane, &vkms_state->base); @@ -86,5 +93,7 @@ static void vkms_plane_destroy_state(struct drm_plane *plane, static struct drm_plane_state *vkms_plane_create_state(struct drm_plane *plane) { + struct vkms_plane *vkms_plane = to_vkms_plane(plane); struct vkms_plane_state *vkms_state; + u64 val; vkms_state = kzalloc_obj(*vkms_state); @@ -96,12 +105,51 @@ static struct drm_plane_state *vkms_plane_create_state(struct drm_plane *plane) __drm_gem_shadow_plane_state_init(plane, &vkms_state->base); + if (!drm_object_property_get_default_value(&plane->base, + vkms_plane->vkms_test_do_not_use_property, + &val)) + vkms_state->vkms_test_do_not_use_value = val; + return &(&vkms_state->base)->base; } +static int vkms_plane_atomic_set_property(struct drm_plane *plane, + struct drm_plane_state *state, + struct drm_property *property, + uint64_t val) +{ + struct vkms_plane *vkms_plane = to_vkms_plane(plane); + struct vkms_plane_state *vkms_state = to_vkms_plane_state(state); + + if (property == vkms_plane->vkms_test_do_not_use_property) { + vkms_state->vkms_test_do_not_use_value = val; + return 0; + } + + return -EINVAL; +} + +static int vkms_plane_atomic_get_property(struct drm_plane *plane, + const struct drm_plane_state *state, + struct drm_property *property, + uint64_t *val) +{ + const struct vkms_plane_state *vkms_state = to_vkms_plane_state(state); + const struct vkms_plane *vkms_plane = to_vkms_plane(plane); + + if (property == vkms_plane->vkms_test_do_not_use_property) { + *val = vkms_state->vkms_test_do_not_use_value; + return 0; + } + + return -EINVAL; +} + static const struct drm_plane_funcs vkms_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .atomic_create_state = vkms_plane_create_state, - .atomic_duplicate_state = vkms_plane_duplicate_state, + .atomic_set_property = vkms_plane_atomic_set_property, + .atomic_get_property = vkms_plane_atomic_get_property, + .atomic_create_state = vkms_plane_create_state, + .atomic_duplicate_state = vkms_plane_duplicate_state, .atomic_destroy_state = vkms_plane_destroy_state, }; @@ -284,4 +332,15 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, DRM_COLOR_YCBCR_FULL_RANGE); + plane->vkms_test_do_not_use_property = + drm_property_create_range(dev, 0, + "vkms-test-do-not-use-in-prod", + 0, U32_MAX); + if (!plane->vkms_test_do_not_use_property) + return ERR_PTR(-ENOMEM); + + drm_object_attach_property(&plane->base.base, + plane->vkms_test_do_not_use_property, + 0); + if (vkms_config_plane_get_default_pipeline(plane_cfg)) vkms_initialize_colorops(&plane->base); -- 2.55.0