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 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 CA261C83F2E for ; Thu, 29 Aug 2024 14:46:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 647E010E6C7; Thu, 29 Aug 2024 14:46:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="bwBBqSLw"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2063310E6C7 for ; Thu, 29 Aug 2024 14:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724942782; x=1756478782; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1dLcbWj3m74QuD2OTvTAztDWUXGbsZYpSVFz7UnVl7o=; b=bwBBqSLwwLPWh30Hz+OT1Rj0hDfvawBcmQNeKtwNcULeI1qmzFSAV5JC Fw0Ly0m/FJOdNfURgflIxUY3mIWpTSmRGvGwlzF5e5im0dNGjml6SecF9 GT8sF8+7oPAQMpxJDtrm11+y6e1M6xO48QsbzVwCpzaNLAmLsE/PwbWTH 4Edo/R/+PpyIEIglqLXGPicySHR5EMD/jgLlfp47TsHEtulZVkBVK6njk teO2nDCInVSsa3vJpiMpbYoAr+FTCX2pAluq6Prg9F57ZOvq6QM4itNU2 0GfN69pziJx1IAecy6cVCR42e0+MMhEw4KPcpcKUxo6luIrO1oS//baS+ A==; X-CSE-ConnectionGUID: z9rE1oP3TjK1bttONu4XLA== X-CSE-MsgGUID: +zBtwhASR7iEqfQfT7nCPw== X-IronPort-AV: E=McAfee;i="6700,10204,11179"; a="34947498" X-IronPort-AV: E=Sophos;i="6.10,185,1719903600"; d="scan'208";a="34947498" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 07:46:07 -0700 X-CSE-ConnectionGUID: but9d7sWR9m/19PBB21zcQ== X-CSE-MsgGUID: FiKOsx7zSn+NVvfU88LudQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,185,1719903600"; d="scan'208";a="64303934" Received: from bergbenj-mobl1.ger.corp.intel.com (HELO localhost.localdomain) ([10.245.246.237]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 07:46:03 -0700 From: Christoph Manszewski To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Kamil Konieczny , Dominik Grzegorzek , Maciej Patelczyk , =?UTF-8?q?Dominik=20Karol=20Pi=C4=85tkowski?= , Pawel Sikora , Andrzej Hajda , Kolanupaka Naveena , Mika Kuoppala , Gwan-gyeong Mun , Christoph Manszewski , Jonathan Cavitt , Lucas De Marchi Subject: [PATCH i-g-t v5 01/17] drm-uapi/xe: Sync with oa uapi fix Date: Thu, 29 Aug 2024 16:45:31 +0200 Message-Id: <20240829144547.105371-2-christoph.manszewski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240829144547.105371-1-christoph.manszewski@intel.com> References: <20240829144547.105371-1-christoph.manszewski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Align with kernel commit f2881dfdaaa9 ("drm/xe/oa/uapi: Make bit masks unsigned"). Use built header instead of raw uapi header. Cc: Jonathan Cavitt Cc: Lucas De Marchi Signed-off-by: Christoph Manszewski Reviewed-by: Kamil Konieczny --- include/drm-uapi/xe_drm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h index 29425d7fd..f0a450db9 100644 --- a/include/drm-uapi/xe_drm.h +++ b/include/drm-uapi/xe_drm.h @@ -3,8 +3,8 @@ * Copyright © 2023 Intel Corporation */ -#ifndef _UAPI_XE_DRM_H_ -#define _UAPI_XE_DRM_H_ +#ifndef _XE_DRM_H_ +#define _XE_DRM_H_ #include "drm.h" @@ -134,7 +134,7 @@ extern "C" { * redefine the interface more easily than an ever growing struct of * increasing complexity, and for large parts of that interface to be * entirely optional. The downside is more pointer chasing; chasing across - * the __user boundary with pointers encapsulated inside u64. + * the boundary with pointers encapsulated inside u64. * * Example chaining: * @@ -1598,10 +1598,10 @@ enum drm_xe_oa_property_id { * b. Counter select c. Counter size and d. BC report. Also refer to the * oa_formats array in drivers/gpu/drm/xe/xe_oa.c. */ -#define DRM_XE_OA_FORMAT_MASK_FMT_TYPE (0xff << 0) -#define DRM_XE_OA_FORMAT_MASK_COUNTER_SEL (0xff << 8) -#define DRM_XE_OA_FORMAT_MASK_COUNTER_SIZE (0xff << 16) -#define DRM_XE_OA_FORMAT_MASK_BC_REPORT (0xff << 24) +#define DRM_XE_OA_FORMAT_MASK_FMT_TYPE (0xffu << 0) +#define DRM_XE_OA_FORMAT_MASK_COUNTER_SEL (0xffu << 8) +#define DRM_XE_OA_FORMAT_MASK_COUNTER_SIZE (0xffu << 16) +#define DRM_XE_OA_FORMAT_MASK_BC_REPORT (0xffu << 24) /** * @DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT: Requests periodic OA unit @@ -1698,4 +1698,4 @@ struct drm_xe_oa_stream_info { } #endif -#endif /* _UAPI_XE_DRM_H_ */ +#endif /* _XE_DRM_H_ */ -- 2.34.1