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.133.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 E1C141A38D5 for ; Mon, 30 Sep 2024 23:41:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727739675; cv=none; b=sMa16cle/LoaOJ4iFhEXP87REpGifpohg30+WwRkRd3TVI3kpiBxYuVjtBi3NfQIZgbs4Jt0O/jgT9ymnGl/P08OFJD1NAVjTomxqxrAAaUgX6XgdBE6MBx2t6ZmgPeWHhZJQo8Pl8WvgcmCEJ4XoOyGoGBKNiFbA7y/1Tbv7uw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727739675; c=relaxed/simple; bh=V3hbW7eY5HGeo6OkgZL+A71Ajxv5neGb19lbxIH2wIM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ofWFuu+1bZ5lHpN+3HEYglERhu1Q+VLnDwXolbvLO7sUuBOJLLTv9zlYpCXoIDsjgUaX8qZvaCbr1V9jTD+GAkuBPbfClHLGD95MUxcfofzp4CvV0kjPDB4Ie/7RGncwE9bH0wg1f/hAeETrkryRnzp+1IO2rqOTf8lN7nE+wRI= 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=Nbmw8xGg; arc=none smtp.client-ip=170.10.133.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="Nbmw8xGg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727739673; 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=Wwd9KyXQl0BylRT4eiU/cc5fZo+yn5dpVQ2DRtqGoyA=; b=Nbmw8xGgolZBsIn4nR0YemPS0UgGcwfW3Gmy/IpQeNIR5HKCLlXbYO+0sKSj0KkTzXJjl3 XaTDXRMnUDxyk+LtNzqZn4Kk/ZyWucAtI7tgIDKEo+mkVhRUL1QymBLLpJYvg7Os09K4xN 1/xieBOrsOY98cuF9mW6yLwpmpTaunM= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-ql9qTW94PYqZ09md1Du9_Q-1; Mon, 30 Sep 2024 19:41:09 -0400 X-MC-Unique: ql9qTW94PYqZ09md1Du9_Q-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (unknown [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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 79796193E8CD; Mon, 30 Sep 2024 23:41:07 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.32.36]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5DC423003DEC; Mon, 30 Sep 2024 23:41:03 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org Cc: Asahi Lina , Danilo Krummrich , mcanal@igalia.com, airlied@redhat.com, zhiw@nvidia.com, cjia@nvidia.com, jhubbard@nvidia.com, Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , linux-kernel@vger.kernel.org (open list) Subject: [WIP RFC v2 29/35] rust: drm/kms: Add DriverCrtc::atomic_begin() and atomic_flush() Date: Mon, 30 Sep 2024 19:10:12 -0400 Message-ID: <20240930233257.1189730-30-lyude@redhat.com> In-Reply-To: <20240930233257.1189730-1-lyude@redhat.com> References: <20240930233257.1189730-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 methods for implementing the atomic_begin and atomic_flush callbacks for a CRTC. Signed-off-by: Lyude Paul --- rust/kernel/drm/kms/crtc.rs | 78 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/rust/kernel/drm/kms/crtc.rs b/rust/kernel/drm/kms/crtc.rs index ec9b58763dcca..a4e955364bd8c 100644 --- a/rust/kernel/drm/kms/crtc.rs +++ b/rust/kernel/drm/kms/crtc.rs @@ -90,8 +90,8 @@ pub trait DriverCrtc: Send + Sync + Sized { mode_set: None, mode_valid: None, mode_fixup: None, - atomic_begin: None, - atomic_flush: None, + atomic_begin: if Self::HAS_ATOMIC_BEGIN { Some(atomic_begin_callback::) } else { None }, + atomic_flush: if Self::HAS_ATOMIC_FLUSH { Some(atomic_flush_callback::) } else { None }, mode_set_nofb: None, mode_set_base: None, mode_set_base_atomic: None, @@ -132,6 +132,36 @@ fn atomic_check( ) -> Result { build_error::build_error("This should not be reachable") } + + /// The optional [`drm_crtc_helper_funcs.atomic_begin`] hook. + /// + /// This hook will be called before a set of [`Plane`] updates are performed for the given + /// [`Crtc`]. + /// + /// [`drm_crtc_helper_funcs.atomic_begin`]: srctree/include/drm/drm_modeset_helper_vtables.h + fn atomic_begin( + crtc: &Crtc, + old_state: &CrtcState, + new_state: BorrowedCrtcState<'_, CrtcState>, + state: &AtomicStateMutator + ) { + build_error::build_error("This should not be reachable") + } + + /// The optional [`drm_crtc_helper_funcs.atomic_flush`] hook. + /// + /// This hook will be called after a set of [`Plane`] updates are performed for the given + /// [`Crtc`]. + /// + /// [`drm_crtc_helper_funcs.atomic_flush`]: srctree/include/drm/drm_modeset_helper_vtables.h + fn atomic_flush( + crtc: &Crtc, + old_state: &CrtcState, + new_state: BorrowedCrtcState<'_, CrtcState>, + state: &AtomicStateMutator + ) { + build_error::build_error("This should never be reachable") + } } /// The generated C vtable for a [`DriverCrtc`]. @@ -776,3 +806,47 @@ fn as_raw(&self) -> *mut bindings::drm_crtc_state { Ok(0) }) } + +unsafe extern "C" fn atomic_begin_callback( + crtc: *mut bindings::drm_crtc, + state: *mut bindings::drm_atomic_state, +) { + // SAFETY: + // * We're guaranteed `crtc` is of type `Crtc` via type invariants. + // * We're guaranteed by DRM that `crtc` is pointing to a valid initialized state. + let crtc = unsafe { Crtc::from_raw(crtc) }; + + // SAFETY: We're guaranteed by DRM that `state` points to a valid instance of `drm_atomic_state` + let state = unsafe { AtomicStateMutator::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_crtc_state(crtc).unwrap_unchecked(), + state.get_new_crtc_state(crtc).unwrap_unchecked(), + )}; + + T::atomic_begin(crtc, old_state, new_state, &state); +} + +unsafe extern "C" fn atomic_flush_callback( + crtc: *mut bindings::drm_crtc, + state: *mut bindings::drm_atomic_state, +) { + // SAFETY: + // * We're guaranteed `crtc` is of type `Crtc` via type invariants. + // * We're guaranteed by DRM that `crtc` is pointing to a valid initialized state. + let crtc = unsafe { Crtc::from_raw(crtc) }; + + // SAFETY: We're guaranteed by DRM that `state` points to a valid instance of `drm_atomic_state` + let state = unsafe { AtomicStateMutator::new(NonNull::new_unchecked(state)) }; + + // SAFETY: We're in an atomic flush callback, so we know that both the new and old state are + // present + let (old_state, new_state) = unsafe {( + state.get_old_crtc_state(crtc).unwrap_unchecked(), + state.get_new_crtc_state(crtc).unwrap_unchecked(), + )}; + + T::atomic_flush(crtc, old_state, new_state, &state); +} -- 2.46.1