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 98C55D41D46 for ; Thu, 14 Nov 2024 04:58:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F52E10E79B; Thu, 14 Nov 2024 04:58:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VAb6AQE+"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81C5010E16D; Thu, 14 Nov 2024 04:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731560329; x=1763096329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=F99+D3f4Jz9QtWpiizcMQnW9R/W5QDFiUHCg2/7eFBc=; b=VAb6AQE+zORR46BfbBQbms28kiewp4q3TUp4NGJsHxmqynVC3Kd6M+xA kgVzCHRSfOEH9DeHtXnRqM16y/mB7SIpV+J/H+ezs700aFl6duiHqMiwz BmVsEs0b7TnGrd3hqywbazWMG5Ph2m6tBk7sSqNDkoCBpW3VxwZY95C+J peyqgsuQ5KaLpCssFVNkCllCEr8p0DGm9eyhMiRBnYoqp/fQE/0S99qRx O2Flu9PaTmmrjc6STJc4Ouh9HzyvkYwWgDdUeiMAtULXBOgsySDti5vGX JH0ILb8We21X+o7ALG04mY2Hi+CAvKjpfEMkRcjzcAbxZ0mToOdz2Avl0 Q==; X-CSE-ConnectionGUID: GF9Uqk5TTySqviDXHDMipA== X-CSE-MsgGUID: AeydOGSwQsmMrG4OM8zS2A== X-IronPort-AV: E=McAfee;i="6700,10204,11255"; a="35409529" X-IronPort-AV: E=Sophos;i="6.12,153,1728975600"; d="scan'208";a="35409529" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2024 20:58:48 -0800 X-CSE-ConnectionGUID: PNlwYXm8RhqP0DB4u3Zoxw== X-CSE-MsgGUID: CUanZPM8R4WdxKGMbQ8n/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,153,1728975600"; d="scan'208";a="92139108" Received: from tejas-super-server.iind.intel.com ([10.145.169.166]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2024 20:58:47 -0800 From: Tejas Upadhyay To: igt-dev@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Tejas Upadhyay Subject: [i-g-t 1/4] lib/i915_drm_local: Remove macros added via merged kernel Date: Thu, 14 Nov 2024 10:31:26 +0530 Message-Id: <20241114050129.1381711-2-tejas.upadhyay@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114050129.1381711-1-tejas.upadhyay@intel.com> References: <20241114050129.1381711-1-tejas.upadhyay@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" The uapi on the kernel side is merged, I915_ENGINE_CLASS_COMPUTE, DRM_I915_PERF_PROP_OA_ENGINE_CLASS, DRM_I915_QUERY_GEOMETRY_SUBSLICES and DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE is part of drm-next, remove this. Signed-off-by: Tejas Upadhyay --- lib/i915/i915_drm_local.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/i915/i915_drm_local.h b/lib/i915/i915_drm_local.h index af0176500..dd646aedf 100644 --- a/lib/i915/i915_drm_local.h +++ b/lib/i915/i915_drm_local.h @@ -19,12 +19,6 @@ extern "C" { * or local_ prefix and without any #ifndef's. Attempt should be made to * clean these up when kernel uapi headers are sync'd. */ -#define I915_ENGINE_CLASS_COMPUTE 4 - -#define DRM_I915_QUERY_GEOMETRY_SUBSLICES 6 - -#define DRM_I915_PERF_PROP_OA_ENGINE_CLASS 9 -#define DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE 10 #if defined(__cplusplus) } -- 2.34.1