From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794326610; b=byZ8XmXn9IXXUNK9ywfFI+TL4wrAVZFfPOXjVq2UFuny6iU19PkwX7Yr26xet9WgclXx Axlba0PGhY5VCm1Y5boFMBJ3yOsKW2m5P09TAVmNIp3dL4IUU3FOVQurgITT9bVls2DZ2 lmnTFjD0Be3NL9DejWMEhjX/46KHxbnjxOxuPtGl0wWIdnNkNc2nA/nSJgqSPQF1XAJve cat68zE2CFMTkhwl+vtGH54hrE1gVQkWy8DdRPvFdHVBsQDnVnztPvRUm9qd0Bv0R9j/a vMxCsCC5pCz3YnrtSCrsjO9jeBK0CKNoA11XLil/v5+/nq9s11M2KMa7yWhVNiXja2w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794326610; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; bh=hxkD/APlz4ZE9WZTrHrnMSE/qJyH/QHAerVotltNtS0=; b=JxT/P9OOXIuryYXIqqY6B6s/5Ljz/Nf6TTbsrV0h8VDERSnnAVVv18R8EATd396y+aK7 SybpFuTvBTMHRehXnhkUwLwGAIEJXvxNnGPLW16O11kfYke+zxbgbyqH/iPFnj6ywezYi 1jgzd5t+iSScmSP3Cdaq+iIcrYDe2zYQGJOnFHY3z/p+sr50OWKpGgDW2zF+cEKNaD/FJ PCvBHbzEOgLpESkZ1Umd+qMeApXg25GICO8zkDcS/kg8UVlvQDpyrhcAhVq0YhuVbwmaz KntIKcxj4Ny/op/PWEYn8PkarKkLS1qDuhC4ArLSVS/LBJ5yFePdYAkHBAE4KTRpT0g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ZcyEtWju; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E34560A3834 for ; Tue, 10 Nov 2026 16:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ZcyEtWju Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C4491F008A2; Tue, 10 Nov 2026 16:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794326610; bh=hxkD/APlz4ZE9WZTrHrnMSE/qJyH/QHAerVotltNtS0=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ZcyEtWju3BbwgW3rBjcSMTM9omVg0bIemgjTSMCba+mUaColPk3E8V2DkT6kTypwX 2axCc1RzruShlShfMnIOuybdu/WLgthnSOevOLwUAu05ziQXDio4WEzOgBwEDvq8ST eJVrMYZRKsdiUjJD0LVkDOHNRrV6ZE+4fgASkAeTXxEECu+MDb8n80SBSYknNbUllC shw3Z7mGHx4cC6DH9kSm6I5ab2Onl6plzhIxRFc59/n7sWs4fC5+CARNAN1vy4reSn o3PlVo1Qah81JeYWzQcGiuP8fcTKiTg1CIPg3Q13g10Aa7Zh1mVV4Bku7Bfw1SDdIf uzSn6jPv7j+zA== From: Maxime Ripard Date: Tue, 10 Nov 2026 17:02:57 +0100 Subject: [PATCH v9 10/10] drm/vkms: Add driver-specific plane property for testing X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261110-drm-reset-state-flag-v9-10-ddb0e26324a0@kernel.org> References: <20261110-drm-reset-state-flag-v9-0-ddb0e26324a0@kernel.org> In-Reply-To: <20261110-drm-reset-state-flag-v9-0-ddb0e26324a0@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 , Oarora Etimis X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6559; i=mripard@kernel.org; h=from:subject:message-id; bh=sZsUVPFgkQHbeGEHeaHzcf7EglZcsfxqosKgEZf95L8=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFmfHQwanrCqrnpz9cp9Wd+lSbsn26iuYf1h8aLzzP+5H GaLnyd+75jKwiDMySArpsjyRCbs9PL2xVUO9it/wMxhZQIZwsDFKQATMV/OWKfeVv40yO2B8z3p lfUP3/A/vnv+2LvCphmqRYesd9Ux/ZDqfL/Y+jLPfn2fbwKPTjO8DmGsz1jof26O5JHVM48V2k5 SF5jAnvNRYl3zn7PmJ6Q6rrv9n7PSY51JcW3SpcMRbbs67u7bDAA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D 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 Reviewed-by: Oarora Etimis 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 @@ -144,20 +144,23 @@ struct conversion_matrix { * @base: base plane state * @frame_info: data required for composing computation * @pixel_read_line: function to read a pixel line in this plane. The creator of a * 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 { struct drm_shadow_plane_state base; struct vkms_frame_info frame_info; 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; }; struct vkms_color_lut { struct drm_color_lut *base; size_t lut_length; 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 @@ -9,14 +9,18 @@ #include #include #include #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, DRM_FORMAT_ABGR8888, DRM_FORMAT_BGRA8888, DRM_FORMAT_RGBA8888, @@ -52,16 +56,19 @@ static const u32 vkms_formats[] = { }; 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; vkms_state = kzalloc_obj(*vkms_state); if (!vkms_state) 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); return &vkms_state->base.base; } @@ -83,28 +90,69 @@ static void vkms_plane_destroy_state(struct drm_plane *plane, kfree(vkms_state); } 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); if (!vkms_state) { DRM_ERROR("Cannot allocate vkms_plane_state\n"); return ERR_PTR(-ENOMEM); } __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, }; static void vkms_plane_atomic_update(struct drm_plane *plane, struct drm_atomic_commit *state) @@ -281,10 +329,21 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | BIT(DRM_COLOR_YCBCR_FULL_RANGE), DRM_COLOR_YCBCR_BT601, 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); return plane; } -- 2.56.0