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 14F2FD66BAC for ; Thu, 28 Nov 2024 05:52:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C54D510E924; Thu, 28 Nov 2024 05:52:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="TBKHc/M8"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34EA210E924; Thu, 28 Nov 2024 05:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732773146; x=1764309146; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/dT61utc4TT7Ys3PilCsKAG2msotwCgMpPLu8bintwU=; b=TBKHc/M8pOstPPQbenA2OAPh3glzOvNX1LdFRPWXXdP2kL2ioOJ489pX 6URyXE+t+gNFpVGaDG5uoGzSOnpVEjy7D0lGJfM8oa8GO8C1NFSZvcrSG ul7cKUc0XYnPP05ZqM/4widuKrZKO8K2XyOmbzorgw5AZzBqGVkxP3CNI mzhhb0ADtRGo/n3jrt5AGDasYGDBa+KXlpu4hgkVGwXn3qyQjV5VMRZ4M xvcFatNBnocTohqIJWomUxOs8p+SdUFAE7775LHZZeQQbDm9eJGadvqG5 HvSzowlUI4cEuE5KLEuIRFk+eprMVcmfazdBs8ISqTeK7EB2ohc74wpHW w==; X-CSE-ConnectionGUID: sH4ar31TTY+yHulK9QUqWg== X-CSE-MsgGUID: TWnlv7/aSYSW2GTbsB0euA== X-IronPort-AV: E=McAfee;i="6700,10204,11269"; a="32366806" X-IronPort-AV: E=Sophos;i="6.12,191,1728975600"; d="scan'208";a="32366806" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2024 21:52:26 -0800 X-CSE-ConnectionGUID: +fDyCB9iT7+qFy8BdqziiQ== X-CSE-MsgGUID: fm/nowYYRRifsbgo3G0AwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="97201724" Received: from tejas-super-server.iind.intel.com ([10.145.169.166]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2024 21:52:24 -0800 From: Tejas Upadhyay To: igt-dev@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Tejas Upadhyay , Matthew Auld Subject: [i-g-t V5 2/4] include/drm-uapi-experimental: Move i915_drm_local.h to drm-uapi-experimental Date: Thu, 28 Nov 2024 11:26:45 +0530 Message-Id: <20241128055647.1677371-3-tejas.upadhyay@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241128055647.1677371-1-tejas.upadhyay@intel.com> References: <20241128055647.1677371-1-tejas.upadhyay@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" i915_drm_local.h is for temporary local addition of defines before KMD is merged upstream and defines replaced with it. We have similar local defines requirement for xe as well for some cases. So for common use move i915_drm_local.h to drm-uapi-experimental/ and rename it to intel_drm_local.h V4(MAuld) - Update copyright content V2(MAuld) - Remove include as it is empty now - Add details in commit message Reviewed-by: Matthew Auld Signed-off-by: Tejas Upadhyay --- .../drm-uapi-experimental/intel_drm_local.h | 27 +++++++++++++++++++ lib/i915/gem_scheduler.c | 1 - lib/i915/intel_memory_region.h | 1 - lib/igt_gt.h | 2 +- tools/i915-perf/i915_perf_recorder.c | 2 -- 5 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 include/drm-uapi-experimental/intel_drm_local.h diff --git a/include/drm-uapi-experimental/intel_drm_local.h b/include/drm-uapi-experimental/intel_drm_local.h new file mode 100644 index 000000000..b48c9e219 --- /dev/null +++ b/include/drm-uapi-experimental/intel_drm_local.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2024 Intel Corporation + */ +#ifndef _INTEL_DRM_LOCAL_H_ +#define _INTEL_DRM_LOCAL_H_ + +#if defined(__cplusplus) +extern "C" { +#endif + +/* + * It is necessary on occasion to add uapi declarations to IGT before they + * appear in imported kernel uapi headers. This header is provided for this + * purpose. + + * Early uapi declarations should be added here exactly as they are + * expected to appear in the kernel uapi headers, i.e. without the LOCAL_ + * or local_ prefix and without any #ifndef's. Attempt should be made to + * clean these up when kernel uapi headers are sync'd. + */ + +#if defined(__cplusplus) +} +#endif + +#endif /* _INTEL_DRM_LOCAL_H_ */ diff --git a/lib/i915/gem_scheduler.c b/lib/i915/gem_scheduler.c index 0087df902..e80c775af 100644 --- a/lib/i915/gem_scheduler.c +++ b/lib/i915/gem_scheduler.c @@ -28,7 +28,6 @@ #include "igt_core.h" #include "ioctl_wrappers.h" -#include "i915/i915_drm_local.h" #include "i915/gem_scheduler.h" #include "i915/gem_submission.h" diff --git a/lib/i915/intel_memory_region.h b/lib/i915/intel_memory_region.h index 9e24bd8fb..4641b18c1 100644 --- a/lib/i915/intel_memory_region.h +++ b/lib/i915/intel_memory_region.h @@ -22,7 +22,6 @@ */ #include "i915_drm.h" #include "igt_collection.h" -#include "i915_drm_local.h" #ifndef INTEL_MEMORY_REGION_H #define INTEL_MEMORY_REGION_H diff --git a/lib/igt_gt.h b/lib/igt_gt.h index d3213123d..82ed22be7 100644 --- a/lib/igt_gt.h +++ b/lib/igt_gt.h @@ -24,11 +24,11 @@ #ifndef IGT_GT_H #define IGT_GT_H +#include "drm-uapi-experimental/intel_drm_local.h" #include "igt_debugfs.h" #include "igt_dummyload.h" #include "igt_core.h" -#include "i915/i915_drm_local.h" #include "i915_drm.h" struct pci_device; diff --git a/tools/i915-perf/i915_perf_recorder.c b/tools/i915-perf/i915_perf_recorder.c index ca4354832..3f3692dc8 100644 --- a/tools/i915-perf/i915_perf_recorder.c +++ b/tools/i915-perf/i915_perf_recorder.c @@ -44,8 +44,6 @@ #include -#include "i915/i915_drm_local.h" - #include "igt_core.h" #include "intel_chipset.h" #include "i915/perf.h" -- 2.34.1