From patchwork Mon Sep 30 23:09:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 13817256 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2940ECEB2CB for ; Mon, 30 Sep 2024 23:37:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A06FD10E301; Mon, 30 Sep 2024 23:37:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="PRdexgwx"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1000810E301 for ; Mon, 30 Sep 2024 23:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727739465; 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=6Zb0rBlFBS6DnNXycQrkSdH1hnOzRIIqb3zhPvtIptc=; b=PRdexgwxr8Ff5JiHik4JwvmKQ26HWj0b4csdcC/Mb+FvVxrEureomUqMyaRCG5Gn7e0WjC 4cl/hmBwg6mDEtKqFbvsiet+QqWK3l6ar9STq/Y3n0S0cOiaDo2mv8r+KEkPWAHDc5dHNX tBV52YLu9gXrKG6F9LNUg+o2opL8yfk= Received: from mx-prod-mc-04.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-478-OoxvmIacM-WG0ZEoppEFHw-1; Mon, 30 Sep 2024 19:37:42 -0400 X-MC-Unique: OoxvmIacM-WG0ZEoppEFHw-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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E4735196A40C; Mon, 30 Sep 2024 23:37:39 +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 738DD3003DEC; Mon, 30 Sep 2024 23:37:35 +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_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Mika Westerberg , linux-kernel@vger.kernel.org (open list) Subject: [WIP RFC v2 03/35] rust: drm/kms/fbdev: Add FbdevShmem Date: Mon, 30 Sep 2024 19:09:46 -0400 Message-ID: <20240930233257.1189730-4-lyude@redhat.com> In-Reply-To: <20240930233257.1189730-1-lyude@redhat.com> References: <20240930233257.1189730-1-lyude@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" For drivers which use the shmem based GEM helpers, they'll want to use the relevant drm_fbdev_shmem_setup() functions instead of the drm_fbdev_dma_setup() functions. To allow for this, introduce another FbdevImpl that such drivers can use instead of FbdevDma. Signed-off-by: Lyude Paul --- rust/bindings/bindings_helper.h | 1 + rust/kernel/drm/kms/fbdev.rs | 8 +++++++- rust/kernel/drm/kms/fbdev/shmem.rs | 33 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 rust/kernel/drm/kms/fbdev/shmem.rs diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index 4a8e44e11c96a..9803e0ecac7c1 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/rust/kernel/drm/kms/fbdev.rs b/rust/kernel/drm/kms/fbdev.rs index bdf97500137d8..a1035d948949a 100644 --- a/rust/kernel/drm/kms/fbdev.rs +++ b/rust/kernel/drm/kms/fbdev.rs @@ -5,6 +5,12 @@ use crate::{private::Sealed, drm::{kms::*, device::Device, gem}}; use bindings; +#[cfg(CONFIG_DRM_GEM_SHMEM_HELPER = "y")] +mod shmem; + +#[cfg(CONFIG_DRM_GEM_SHMEM_HELPER = "y")] +pub use shmem::FbdevShmem; + pub(crate) mod private { use super::*; @@ -17,7 +23,7 @@ pub trait FbdevImpl { /// The main trait for a driver's DRM implementation. /// /// Drivers are expected not to implement this directly, and to instead use one of the objects -/// provided by this module such as [`FbdevDma`]. +/// provided by this module such as [`FbdevDma`] and [`FbdevShmem`]. pub trait FbdevImpl: private::FbdevImpl {} /// The fbdev implementation for drivers using the gem DMA helpers. diff --git a/rust/kernel/drm/kms/fbdev/shmem.rs b/rust/kernel/drm/kms/fbdev/shmem.rs new file mode 100644 index 0000000000000..16c3533ad2a0f --- /dev/null +++ b/rust/kernel/drm/kms/fbdev/shmem.rs @@ -0,0 +1,33 @@ +//! The GEM shmem fbdev implementation for rust. +//! +//! This module provides an Fbdev implementation that can be used by Rust KMS drivers using the GEM +//! shmem helpers provided by [`shmem`]. + +use core::marker::*; +use crate::drm::{gem::shmem, kms::*, device::Device}; +use super::{private::FbdevImpl as FbdevImplPrivate, FbdevImpl}; +use bindings; + +/// The fbdev implementation for drivers using the gem shmem helpers. +/// +/// KMS Drivers which use the GEM helpers provided by [`shmem`] should use this for [`Kms::Fbdev`]. +pub struct FbdevShmem(PhantomData); + +impl FbdevImplPrivate for FbdevShmem +where + T: Driver>, + G: shmem::DriverObject +{ + #[inline] + fn setup_fbdev(drm: &Device, mode_config_info: &ModeConfigInfo) { + // SAFETY: Our implementation bounds are proof that this driver is using the gem shmem + // helpers + unsafe { bindings::drm_fbdev_shmem_setup(drm.as_raw(), mode_config_info.preferred_depth) }; + } +} + +impl FbdevImpl for FbdevShmem +where + T: Driver>, + G: shmem::DriverObject +{}