From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 8D0B72066FC for ; Wed, 5 Mar 2025 23:07:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741216076; cv=none; b=O/19UOI5rEv5uFs/TIjJ8SW2OibWSQVCkUcZVgAC+oL+RA3IrAshK1NxSUdmAf4MNnT6OA+tBi+K5/SXD8HOWNKa6ZU5IUfdGd/5KUVEPJQzqaXQujZRaak0owRMpkQniioyCnhakUd0DZVMF0z0wFb6Rf9H8eU22ko042IuR38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741216076; c=relaxed/simple; bh=ykwsaVKw1mpzv+yYZMIqJXcCjgnimTVnBDdZ4X7g/y0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CKg5HLlkaUXGuUGcbLR5cKwX4grf2vctEIGjnZtR0xdqz8Dizhdol/PDc8iVP98GhOw413lv/XEg5Y1EimQ3jcz/bZXGzqckXEPPyPh2/9KVhbBzNb9fJCbzO8jDg4R9zR1upAWXGu68Pd6eiIPfD5ksVEuQM+swgTKRetiTVHM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=JyaHh5k/; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JyaHh5k/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741216073; h=from:from:reply-to:subject:subject: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=P8Wya8waZxf4PRUJ4SmPnCKJ5/8nzDdWThNqRlGolhE=; b=JyaHh5k/HQAlj+oGbUVVdVtTsiJN9JU0URwYQAtp7qSoQ3a0eO75AVSBSWphalYjbRSFJ5 PxwVV0ujx7pRRm3OI0fWHvPNfMqOX6V48SQoNJFf6QrRuxUMXppPv/uqTwDzIev4qndm8c 7Hy3ZrSB5yUlFtuyqz3N2eXl8qnSbUQ= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-113-fTF3WE_ONlOJowyS2fczRQ-1; Wed, 05 Mar 2025 18:07:43 -0500 X-MC-Unique: fTF3WE_ONlOJowyS2fczRQ-1 X-Mimecast-MFC-AGG-ID: fTF3WE_ONlOJowyS2fczRQ_1741216061 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C3631800262; Wed, 5 Mar 2025 23:07:41 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.88.81]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CAB83300019E; Wed, 5 Mar 2025 23:07:37 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org Cc: Danilo Krummrich , mcanal@igalia.com, Alice Ryhl , Maxime Ripard , Simona Vetter , Daniel Almeida , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , linux-kernel@vger.kernel.org (open list) Subject: [RFC v3 21/33] rust: drm/kms: Add DriverPlane::atomic_check() Date: Wed, 5 Mar 2025 17:59:37 -0500 Message-ID: <20250305230406.567126-22-lyude@redhat.com> In-Reply-To: <20250305230406.567126-1-lyude@redhat.com> References: <20250305230406.567126-1-lyude@redhat.com> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Optional trait method for implementing a plane's atomic_check(). Signed-off-by: Lyude Paul --- V3: * Document ManuallyDrop uses better Signed-off-by: Lyude Paul --- rust/kernel/drm/kms/plane.rs | 53 ++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/rust/kernel/drm/kms/plane.rs b/rust/kernel/drm/kms/plane.rs index b090aebc35649..f3adc30c17489 100644 --- a/rust/kernel/drm/kms/plane.rs +++ b/rust/kernel/drm/kms/plane.rs @@ -11,7 +11,7 @@ alloc::KBox, bindings, drm::{device::Device, fourcc::*}, - error::{to_result, Error}, + error::{from_result, to_result, Error}, init::Zeroable, prelude::*, private::Sealed, @@ -20,7 +20,7 @@ use core::{ cell::Cell, marker::*, - mem, + mem::{self, ManuallyDrop}, ops::*, pin::Pin, ptr::{addr_of_mut, null, null_mut, NonNull}, @@ -69,7 +69,11 @@ pub trait DriverPlane: Send + Sync + Sized { cleanup_fb: None, begin_fb_access: None, end_fb_access: None, - atomic_check: None, + atomic_check: if Self::HAS_ATOMIC_CHECK { + Some(atomic_check_callback::) + } else { + None + }, atomic_update: if Self::HAS_ATOMIC_UPDATE { Some(atomic_update_callback::) } else { @@ -117,6 +121,21 @@ fn atomic_update( ) { build_error::build_error("This should not be reachable") } + + /// The optional [`drm_plane_helper_funcs.atomic_check`] hook for this plane. + /// + /// Drivers may use this to customize the atomic check phase of their [`Plane`] objects. The + /// result of this function determines whether the atomic check passed or failed. + /// + /// [`drm_plane_helper_funcs.atomic_check`]: srctree/include/drm/drm_modeset_helper_vtables.h + fn atomic_check( + _plane: &Plane, + _new_state: PlaneStateMutator<'_, PlaneState>, + _old_state: &PlaneState, + _state: &AtomicStateComposer, + ) -> Result { + build_error::build_error("This should not be reachable") + } } /// The generated C vtable for a [`DriverPlane`]. @@ -974,3 +993,31 @@ fn (PlaneStateMutator<'a, OpaquePlaneState>) -> Self T::atomic_update(plane, new_state, old_state, &state); } + +unsafe extern "C" fn atomic_check_callback( + plane: *mut bindings::drm_plane, + state: *mut bindings::drm_atomic_state, +) -> i32 { + // SAFETY: + // - We're guaranteed `plane` is of type `Plane` via type invariants. + // - We're guaranteed by DRM that `plane` is pointing to a valid initialized state. + let plane = unsafe { Plane::from_raw(plane) }; + + // SAFETY: We're guaranteed by DRM that `state` points to a valid instance of `drm_atomic_state` + // We use ManuallyDrop here since AtomicStateComposer would otherwise drop a owned reference to + // the atomic state upon finishing this callback. + let state = ManuallyDrop::new(unsafe { + AtomicStateComposer::::new(NonNull::new_unchecked(state)) + }); + + // SAFETY: We're guaranteed by DRM that both the old and new atomic state are present within + // this `drm_atomic_state` + let (old_state, new_state) = unsafe { + ( + state.get_old_plane_state(plane).unwrap_unchecked(), + state.get_new_plane_state(plane).unwrap_unchecked(), + ) + }; + + from_result(|| T::atomic_check(plane, new_state, old_state, &state).map(|_| 0)) +} -- 2.48.1