From patchwork Mon Sep 30 23:09:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 13817264 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 33EF8CEB2CB for ; Mon, 30 Sep 2024 23:38:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8BE910E570; Mon, 30 Sep 2024 23:38:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Oky8VVVR"; 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 026B610E570 for ; Mon, 30 Sep 2024 23:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727739534; 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=jWkQB1pyBirQ1KP5U86Ct+4qpRkAEhXPzsNN9WOdD3Q=; b=Oky8VVVRoysLy8e30uNxv4WBF2qhXVAgIK5coBxNZeCS4gKI/tlr6MHtNW2VkWNpno26EX oXDif5I+YWxRebKLvm+XjKhycgJUuCLErX051ZTJx/dmZt9YpoXKR2xzFNeAy/lQqKcSYr TFJrWTQXqjTQqZYl5bvv7I1GgwgRIlM= 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-564-tXS1bctpM0iGvAUk1iodGg-1; Mon, 30 Sep 2024 19:38:50 -0400 X-MC-Unique: tXS1bctpM0iGvAUk1iodGg-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 5983B1955D47; Mon, 30 Sep 2024 23:38:48 +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 993753003DEC; Mon, 30 Sep 2024 23:38:43 +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 11/35] rust: drm/kms: Add ConnectorGuard::add_modes_noedid() Date: Mon, 30 Sep 2024 19:09:54 -0400 Message-ID: <20240930233257.1189730-12-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" A simple binding for drm_add_modes_noedid() using the ConnectorGuard type we just added. Signed-off-by: Lyude Paul --- rust/bindings/bindings_helper.h | 2 ++ rust/kernel/drm/kms/connector.rs | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index ba1871b05b7fa..7695f11f4363c 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/rust/kernel/drm/kms/connector.rs b/rust/kernel/drm/kms/connector.rs index 57ab29473c344..7d0f67c3bdaf8 100644 --- a/rust/kernel/drm/kms/connector.rs +++ b/rust/kernel/drm/kms/connector.rs @@ -378,6 +378,17 @@ fn deref(&self) -> &Self::Target { } } +impl<'a, T: DriverConnector> ConnectorGuard<'a, T> { + /// Add modes for a [`ConnectorGuard`] without an EDID. + /// + /// Add the specified modes to the connector's mode list up to the given maximum resultion. + /// Returns how many modes were added. + pub fn add_modes_noedid(&self, (max_h, max_v): (i32, i32)) -> i32 { + // SAFETY: We hold the locks required to call this via our type invariants. + unsafe { bindings::drm_add_modes_noedid(self.as_raw(), max_h, max_v) } + } +} + // SAFETY: DRM expects this struct to be zero-initialized unsafe impl Zeroable for bindings::drm_connector_state {}