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 431C7D6DDFE for ; Mon, 18 Nov 2024 06:58:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC8CD10E324; Mon, 18 Nov 2024 06:58:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GexpfY6A"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7448D10E1F9; Mon, 18 Nov 2024 06:58:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731913081; x=1763449081; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eO17UJigM8JTxlq4sWJZKudi6hLJrqL/9SeYrCwxlac=; b=GexpfY6A7NFCZN1Xwe0Gh9prOxQ+eufp7x4f0KmDoJO8RQEsizMZzEEO +eCS8ETp2q8y3fYaJCCfbMNn6ujLaIUyuA3w0m5Fn1sEY781wlmUUA9oX bbZphmPTzazHZ17mroGkmLXoCa5MyH5a4z2QZTtlZbWK2ptYiqID6il+g 5G1fD1dPfcRwzl11xcNG8kxcESxMBedkMnIL9UmoyO+BEe40/7ataQDB7 LVBp6Si3zN+2NMEYnW133UABNdUxOPbeQGsI2AM2vDldKlBJWtPcjzRzm JN+SCoXCgFKk/orquwxO9+hm72QN9j8hDGc0ARS9wWqZnv1Xq+6JxMLgW w==; X-CSE-ConnectionGUID: 3A+3WAHrRHOS2e7Aq1Pmsw== X-CSE-MsgGUID: OrtDRiIFS1KOdlcVA9VwVQ== X-IronPort-AV: E=McAfee;i="6700,10204,11259"; a="42927337" X-IronPort-AV: E=Sophos;i="6.12,163,1728975600"; d="scan'208";a="42927337" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2024 22:58:01 -0800 X-CSE-ConnectionGUID: 4c8ri0QEReyIyezH3Rn39w== X-CSE-MsgGUID: 17uc57lXQ1+4PhETFlPKng== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,163,1728975600"; d="scan'208";a="89543006" Received: from tejas-super-server.iind.intel.com ([10.145.169.166]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2024 22:58:00 -0800 From: Tejas Upadhyay To: igt-dev@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Tejas Upadhyay , Matthew Auld Subject: [i-g-t V2 1/4] lib/i915_drm_local: Remove macros added via merged kernel Date: Mon, 18 Nov 2024 12:32:08 +0530 Message-Id: <20241118070211.1474372-2-tejas.upadhyay@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241118070211.1474372-1-tejas.upadhyay@intel.com> References: <20241118070211.1474372-1-tejas.upadhyay@intel.com> MIME-Version: 1.0 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" 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. Reviewed-by: Matthew Auld 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