From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3568210E029 for ; Fri, 10 Mar 2023 04:38:05 +0000 (UTC) Date: Thu, 09 Mar 2023 20:38:03 -0800 Message-ID: <874jqtmdas.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Zbigniew =?ISO-8859-2?Q?Kempczy=F1ski?= In-Reply-To: <875yb9mdn4.wl-ashutosh.dixit@intel.com> References: <20230307221236.913429-1-zbigniew.kempczynski@intel.com> <20230307221236.913429-3-zbigniew.kempczynski@intel.com> <875yb9mdn4.wl-ashutosh.dixit@intel.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: quoted-printable Subject: Re: [igt-dev] [PATCH i-g-t v7 2/7] lib/xe: Introduce Xe library List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Thu, 09 Mar 2023 20:30:39 -0800, Dixit, Ashutosh wrote: > > On Tue, 07 Mar 2023 14:12:31 -0800, Zbigniew Kempczy=F1ski wrote: > > > > Hi Zbyzsek, > > > +#define for_each_gt(__fd, __gt) \ > > + for (__gt =3D 0; __gt < xe_number_gt(__fd); ++__gt) > > This for_each_gt conflicts with for_each_gt in our internal i915 tree > (which were planning to post upstream soon). How do you want to resolve > this? Can we can just do this? diff --git a/lib/xe/xe_query.h b/lib/xe/xe_query.h index fe1343f6161..72ee6c9478b 100644 --- a/lib/xe/xe_query.h +++ b/lib/xe/xe_query.h @@ -66,6 +66,7 @@ struct xe_device { #define for_each_hw_engine_class(__class) \ for (__class =3D 0; __class < DRM_XE_ENGINE_CLASS_COMPUTE + 1; \ ++__class) +#undef for_each_gt #define for_each_gt(__fd, __gt) \ for (__gt =3D 0; __gt < xe_number_gt(__fd); ++__gt)