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 39D38CA5FC7 for ; Wed, 30 Sep 2026 13:34:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C1A6110F3FF; Wed, 30 Sep 2026 13:34:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="I/fWe8Rm"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id B24F110F3FF; Wed, 30 Sep 2026 13:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790775280; x=1822311280; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=Q+UjtdY4lbX77EJC7C7Ebd6hrXXnSLVpflVt3kzDvnk=; b=I/fWe8RmZBVEaIxw9UZi3ChkeSGEtFL3fLIWBC7y9V8a8yesASUyS7FZ C3zVkFZTh+147creCDhOwGPNzL50AZHtbgN68RRZU5s7e+dz7dgURM0MU snxj1BVzcdmkF9os/sM8dmA5CLJi0FL7Mv5EFQVuFrY48JMZwK9ho1G3s u15rjuDphBshgnA/4/JkYO0eVpCyjVbpp5NYsHVaLrNG6rs40dioCJqw5 2rsabGGM7myqeanNCv+J8JqqCVuN6gEo1X/DtXXRH81I0aMtWJ5jZ1nFR bimwVmZscnCvjR4h86KevCbyKD641pF7YctLhCdcWsM4QgYoXo/tZ21iI g==; X-CSE-ConnectionGUID: S4xnAKr2QL6IISP2KSonHQ== X-CSE-MsgGUID: kgFdcXdaQvCnlQPWTLoahQ== X-IronPort-AV: E=McAfee;i="6800,10657,11920"; a="90371477" X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="90371477" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2026 06:34:40 -0700 X-CSE-ConnectionGUID: tii+KcX8Sty8jXnTmV4q2A== X-CSE-MsgGUID: Cjobh74TS9qTkYISMMvduw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="305198030" Received: from klitkey1-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.175]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2026 06:34:39 -0700 Date: Wed, 30 Sep 2026 16:34:36 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH 01/10] drm/intel: move i915_gtt_view_types.h to include/drm/intel Message-ID: References: <1e6d07316d821c284888c442a8b378e22c9325c2.1789502902.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1e6d07316d821c284888c442a8b378e22c9325c2.1789502902.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Sep 15, 2026 at 11:09:12PM +0300, Jani Nikula wrote: > The i915 and xe drivers share i915_gtt_view_types.h from i915 > source. Move it to include/drm/intel/gtt_view_types.h. > > Remove the i915 compat header. > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- > drivers/gpu/drm/i915/i915_vma_types.h | 3 +-- > .../gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h | 7 ------- > drivers/gpu/drm/xe/display/xe_fb_pin.c | 4 +--- > .../drm/intel/gtt_view_types.h | 6 +++--- > 5 files changed, 6 insertions(+), 16 deletions(-) > delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h > rename drivers/gpu/drm/i915/i915_gtt_view_types.h => include/drm/intel/gtt_view_types.h (93%) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index a5f18ac8a7d0..2a9f690c3d70 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -41,10 +41,10 @@ > #include > #include > #include > +#include > #include > #include > > -#include "i915_gtt_view_types.h" > #include "intel_bios.h" > #include "intel_display.h" > #include "intel_display_conversion.h" > diff --git a/drivers/gpu/drm/i915/i915_vma_types.h b/drivers/gpu/drm/i915/i915_vma_types.h > index a499a3bea874..83fe02833b5e 100644 > --- a/drivers/gpu/drm/i915/i915_vma_types.h > +++ b/drivers/gpu/drm/i915/i915_vma_types.h > @@ -29,11 +29,10 @@ > #include > > #include > +#include > > #include "gem/i915_gem_object_types.h" > > -#include "i915_gtt_view_types.h" > - > /** > * DOC: Global GTT views > * > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h > deleted file mode 100644 > index b261910cd6f9..000000000000 > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -/* SPDX-License-Identifier: MIT */ > -/* Copyright © 2025 Intel Corporation */ > - > -#include "../../i915/i915_gtt_view_types.h" > - > -/* Partial view not supported in xe, fail build if used. */ > -#define I915_GTT_VIEW_PARTIAL > diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c > index b46a2c32ac07..6fae8cc27aad 100644 > --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c > +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c > @@ -4,11 +4,9 @@ > */ > > #include > +#include > #include > > -/* FIXME move the types to parent interface? */ > -#include "i915_gtt_view_types.h" > - > /* FIXME move intel_remapped_info_size() & co. to parent interface? */ > #include "intel_fb.h" > > diff --git a/drivers/gpu/drm/i915/i915_gtt_view_types.h b/include/drm/intel/gtt_view_types.h > similarity index 93% > rename from drivers/gpu/drm/i915/i915_gtt_view_types.h > rename to include/drm/intel/gtt_view_types.h > index 9c4f38db32ff..35a48932e5e8 100644 > --- a/drivers/gpu/drm/i915/i915_gtt_view_types.h > +++ b/include/drm/intel/gtt_view_types.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: MIT */ > /* Copyright © 2025 Intel Corporation */ > > -#ifndef __I915_GTT_VIEW_TYPES_H__ > -#define __I915_GTT_VIEW_TYPES_H__ > +#ifndef __DRM_INTEL_GTT_VIEW_TYPES_H__ > +#define __DRM_INTEL_GTT_VIEW_TYPES_H__ > > #include > > @@ -71,4 +71,4 @@ static inline bool i915_gtt_view_is_rotated(const struct i915_gtt_view *view) > return view->type == I915_GTT_VIEW_ROTATED; > } > > -#endif /* __I915_GTT_VIEW_TYPES_H__ */ > +#endif Are we giving up on the "/* __WHATEVER__ */" stuff for the multiple inclusion guards? > -- > 2.47.3 -- Ville Syrjälä Intel