From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0BC8C74A5B for ; Fri, 17 Mar 2023 12:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229984AbjCQMNr (ORCPT ); Fri, 17 Mar 2023 08:13:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230025AbjCQMNq (ORCPT ); Fri, 17 Mar 2023 08:13:46 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98D38206B5 for ; Fri, 17 Mar 2023 05:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=/WKUdMa+rFnar+m5MEJR5FApwgbeESggxlzzv31hPyg=; b=YUSpuvwvXF7w6JCAchHXh5anX7 dDTByVK9yPgwGjG5XK9RP986Wre2Ezb4sKF75mJvDNaMByhSijDWSVpWvRq/V6wOeFSXnVCq94YWO 4vrv8KZjQeiCIhezvtzi182KP7xUQsOTcNoPAlP1UYCEc7r4D/w7kfq+JNtR6nfwPv85VgONOx4j+ paXk8FzlkZYTC7gZywj+Acgd1gyBbzgYFHxTBDFiP4ZrXfPgmyA/bco885ABF4D4db4j++88sObbl Vp/48QO2spyJn2jPDes9hDzfCNEWedBqn6zq9857QX6sv4d53OqN7Ajzpx5KPZoQefNQmDngKsAam J7ZjWCmQ==; Received: from [177.34.168.16] (helo=bowie..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1pd8xf-00FrGz-9a; Fri, 17 Mar 2023 13:13:31 +0100 From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , Asahi Lina , Faith Ekstrand Cc: rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, Melissa Wen , =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [RFC PATCH 6/9] drm/vgem: move IOCTLs numbers to enum Date: Fri, 17 Mar 2023 09:12:10 -0300 Message-Id: <20230317121213.93991-7-mcanal@igalia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317121213.93991-1-mcanal@igalia.com> References: <20230317121213.93991-1-mcanal@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: rust-for-linux@vger.kernel.org Bindgen doesn't expand C macros, which makes DRM_IOCTL_VGEM_FENCE_ATTACH and DRM_IOCTL_VGEM_FENCE_SIGNAL not accessible through the Rust bindings. So, move the IOCTLs numbers to a enum, preserving the same values and the same name. This won't produce any functional changes to the UAPI and it will make it possible to use this UAPI in Rust. Signed-off-by: Maíra Canal --- include/uapi/drm/vgem_drm.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/uapi/drm/vgem_drm.h b/include/uapi/drm/vgem_drm.h index bf66f5db6da8..53ee3af0b25a 100644 --- a/include/uapi/drm/vgem_drm.h +++ b/include/uapi/drm/vgem_drm.h @@ -39,9 +39,6 @@ extern "C" { #define DRM_VGEM_FENCE_ATTACH 0x1 #define DRM_VGEM_FENCE_SIGNAL 0x2 -#define DRM_IOCTL_VGEM_FENCE_ATTACH DRM_IOWR( DRM_COMMAND_BASE + DRM_VGEM_FENCE_ATTACH, struct drm_vgem_fence_attach) -#define DRM_IOCTL_VGEM_FENCE_SIGNAL DRM_IOW( DRM_COMMAND_BASE + DRM_VGEM_FENCE_SIGNAL, struct drm_vgem_fence_signal) - struct drm_vgem_fence_attach { __u32 handle; __u32 flags; @@ -55,6 +52,12 @@ struct drm_vgem_fence_signal { __u32 flags; }; +/* Note: this is an enum so that it can be resolved by Rust bindgen. */ +enum { + DRM_IOCTL_VGEM_FENCE_ATTACH = DRM_IOWR(DRM_COMMAND_BASE + DRM_VGEM_FENCE_ATTACH, struct drm_vgem_fence_attach), + DRM_IOCTL_VGEM_FENCE_SIGNAL = DRM_IOW(DRM_COMMAND_BASE + DRM_VGEM_FENCE_SIGNAL, struct drm_vgem_fence_signal), +}; + #if defined(__cplusplus) } #endif -- 2.39.2