From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C3A1339A04C for ; Fri, 16 Oct 2026 07:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792135975; cv=none; b=VI/V/Iu7IRivdAwULOvjlpOluRr/lKKruccMtDrr8G/ayavFLmBPolv8o9fbuyTuN+KHQztLnTopcs1rofragIvCS8f/VYEt8I2E1BZJjBDReNMoWaHkxeoAjWrAi9U4AGwoP4VhifPWxa879hdTMt7Ff15zlkgP0EbGCxYjA6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792135975; c=relaxed/simple; bh=L39bKi40Tu27ZP+CQWhjlmNnG20xbUUquvb6A7gC3fQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PT7Kmv/S/0aL959BLJsQ0SUr7ZAQsgESZErYykmv1/Um3vkcDXz8zemm/ankg1EGoPwMuojQQ7iu61SFu7SfOPAhkwC1s0RRN5iqf8qTz6+vxzhb+hdnCKDyNtHQnBsTAskpAQG7MXm6Pbpc7QqJEfH7Pndcg7f/yvJq0cs3QYw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OFeV/Ks6; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OFeV/Ks6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3AE01F000C5; Fri, 16 Oct 2026 07:32:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792135973; bh=2SLOW3vKqEoDipVSNNt6bUEym47+JKCsbhkUgZEliiw=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=OFeV/Ks626shAtzxQOhg1t4Qn6nGE3uFKVMnQGhIaaSYq34NBSPs2fomlEZBrDc4G 0Ptsl9iHt0utv52Y+NblW3Ln7QOdVtVHAma3am76zdUH7TPmYKhcr1wGh//TI5bOoX 8lMUPx2SsaJpZU6kxbvqRe4ytidu770OY1GpANhQk4TdE+UzDBjdzzctHwQtnoJVN7 tBX77nlP2xGFmTUmI4GUNASW0Ex+TlsahKeF8yNqHF6Ct/NZlFmpl/2q+r6W63Ni6w 52BqEIb+Gu8MPIhN/bbVRvZ72W/n8GMkaWMAp2hmUoIQeTEML/XfsvtI+r5SFkkKJ+ DpxLcrQRlgOLA== From: Maxime Ripard Date: Fri, 16 Oct 2026 09:31:46 +0200 Subject: [PATCH v5 14/14] drm/vkms: Add driver-specific plane property for testing 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-Transfer-Encoding: 7bit Message-Id: <20261016-drm-reset-state-flag-v5-14-dad2d64b693b@kernel.org> References: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@kernel.org> In-Reply-To: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@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=6476; i=mripard@kernel.org; h=from:subject:message-id; bh=L39bKi40Tu27ZP+CQWhjlmNnG20xbUUquvb6A7gC3fQ=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFkXLz3T/L40UcgnXc3K1+viCrZkxjz9vxdLLpVsEXm64 5plY/DSjqksDMKcDLJiiixPZMJOL29fXOVgv/IHzBxWJpAhDFycAjCRtwyMDb25X6b22yzakjkv 4GSlKtc5s59MyadlPzFfEotdWbxdyOevmJbz8hfRsvcaf3Vsk97MwVhnI1neaLh0Amff9bntbd4 LrtyY5b+iQlPAIuKk58nIe+Jvd+anviuq+6gXwbeuf+cnxiQA 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 Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vkms/vkms_drv.h | 3 ++ drivers/gpu/drm/vkms/vkms_plane.c | 61 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 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..0ebc131c2788 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,19 @@ 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) + 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.55.0