All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [Intel-xe] [PATCH 6/8] drm/xe: move all top level i915 compat headers to a separate subdirectory
Date: Thu, 2 Mar 2023 22:10:51 -0800	[thread overview]
Message-ID: <20230303061051.yfvv7u5oljxo7bh3@ldmartin-desk2.lan> (raw)
In-Reply-To: <20230302141230.2804699-7-jani.nikula@intel.com>

On Thu, Mar 02, 2023 at 04:12:28PM +0200, Jani Nikula wrote:
>Be more explicit about which headers override i915 top level headers.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>---
> drivers/gpu/drm/xe/Makefile                                 | 6 ++++--
> .../drm/xe/{display => compat-headers}/i915_active_types.h  | 0
> drivers/gpu/drm/xe/{display => compat-headers}/i915_drv.h   | 0
> drivers/gpu/drm/xe/{display => compat-headers}/i915_vma.h   | 0
> .../gpu/drm/xe/{display => compat-headers}/i915_vma_types.h | 0
> .../gpu/drm/xe/{display => compat-headers}/intel_pm_types.h | 0
> .../drm/xe/{display => compat-headers}/intel_runtime_pm.h   | 0
> .../gpu/drm/xe/{display => compat-headers}/intel_wakeref.h  | 0
> 8 files changed, 4 insertions(+), 2 deletions(-)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_active_types.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_drv.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_vma.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/i915_vma_types.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/intel_pm_types.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/intel_runtime_pm.h (100%)
> rename drivers/gpu/drm/xe/{display => compat-headers}/intel_wakeref.h (100%)

maybe compat-i915-headers to be explicit?

Lucas De Marchi

>
>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>index 18257cd7227d..42a34597f16c 100644
>--- a/drivers/gpu/drm/xe/Makefile
>+++ b/drivers/gpu/drm/xe/Makefile
>@@ -99,7 +99,9 @@ xe-y += xe_bb.o \
> 	xe_wopcm.o
>
> # i915 Display compat #defines and #includes
>-subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += -I$(srctree)/$(src)/display/ext \
>+subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
>+	-I$(srctree)/$(src)/display/ext \
>+	-I$(srctree)/$(src)/compat-headers \
> 	-I$(srctree)/drivers/gpu/drm/xe/display/ \
> 	-I$(srctree)/drivers/gpu/drm/i915/display/ \
> 	-I$(srctree)/drivers/gpu/drm/i915/ \
>@@ -220,7 +222,7 @@ obj-$(CONFIG_DRM_XE) += xe.o
> obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/
>
> ifneq ($(CONFIG_DRM_XE_DISPLAY),y)
>-	skipdisplay:=-not -path display/\* -not -path xe_display.h
>+	skipdisplay:=-not -path display/\* -not -path compat-headers/\* -not -path xe_display.h
> endif
>
> # header test
>diff --git a/drivers/gpu/drm/xe/display/i915_active_types.h b/drivers/gpu/drm/xe/compat-headers/i915_active_types.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/i915_active_types.h
>rename to drivers/gpu/drm/xe/compat-headers/i915_active_types.h
>diff --git a/drivers/gpu/drm/xe/display/i915_drv.h b/drivers/gpu/drm/xe/compat-headers/i915_drv.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/i915_drv.h
>rename to drivers/gpu/drm/xe/compat-headers/i915_drv.h
>diff --git a/drivers/gpu/drm/xe/display/i915_vma.h b/drivers/gpu/drm/xe/compat-headers/i915_vma.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/i915_vma.h
>rename to drivers/gpu/drm/xe/compat-headers/i915_vma.h
>diff --git a/drivers/gpu/drm/xe/display/i915_vma_types.h b/drivers/gpu/drm/xe/compat-headers/i915_vma_types.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/i915_vma_types.h
>rename to drivers/gpu/drm/xe/compat-headers/i915_vma_types.h
>diff --git a/drivers/gpu/drm/xe/display/intel_pm_types.h b/drivers/gpu/drm/xe/compat-headers/intel_pm_types.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/intel_pm_types.h
>rename to drivers/gpu/drm/xe/compat-headers/intel_pm_types.h
>diff --git a/drivers/gpu/drm/xe/display/intel_runtime_pm.h b/drivers/gpu/drm/xe/compat-headers/intel_runtime_pm.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/intel_runtime_pm.h
>rename to drivers/gpu/drm/xe/compat-headers/intel_runtime_pm.h
>diff --git a/drivers/gpu/drm/xe/display/intel_wakeref.h b/drivers/gpu/drm/xe/compat-headers/intel_wakeref.h
>similarity index 100%
>rename from drivers/gpu/drm/xe/display/intel_wakeref.h
>rename to drivers/gpu/drm/xe/compat-headers/intel_wakeref.h
>-- 
>2.39.1
>

  reply	other threads:[~2023-03-03  6:11 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-02 14:12 [Intel-xe] [PATCH 0/8] drm/xe: clean up i915 includes both sides Jani Nikula
2023-03-02 14:12 ` [Intel-xe] [PATCH 1/8] drm/i915/display: don't use relative ../i915 includes Jani Nikula
2023-03-02 15:28   ` Lucas De Marchi
2023-03-02 15:45     ` Jani Nikula
2023-03-02 18:00       ` Lucas De Marchi
2023-03-02 14:12 ` [Intel-xe] [PATCH 2/8] drm/i915/display: drop redundant display/ from includes Jani Nikula
2023-03-02 14:12 ` [Intel-xe] [PATCH 3/8] drm/xe: drop unnecessary include Jani Nikula
2023-03-03  6:07   ` Lucas De Marchi
2023-03-02 14:12 ` [Intel-xe] [PATCH 4/8] drm/xe: drop redundant display/ from includes Jani Nikula
2023-03-02 14:12 ` [Intel-xe] [PATCH 5/8] drm/xe: drop redundant ../ " Jani Nikula
2023-03-02 14:12 ` [Intel-xe] [PATCH 6/8] drm/xe: move all top level i915 compat headers to a separate subdirectory Jani Nikula
2023-03-03  6:10   ` Lucas De Marchi [this message]
2023-03-02 14:12 ` [Intel-xe] [PATCH 7/8] drm/xe: remove unnecessary include Jani Nikula
2023-03-02 14:12 ` [Intel-xe] [PATCH 8/8] drm/xe: drop top level i915 from include path Jani Nikula
2023-03-03  6:21   ` Lucas De Marchi
2023-03-03  6:30     ` Lucas De Marchi
2023-03-02 14:26 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/8] drm/i915/display: don't use relative ../i915 includes Patchwork
2023-03-02 17:47   ` Lucas De Marchi
2023-03-03  9:27     ` Jani Nikula
2023-03-02 14:27 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-03-02 14:30 ` [Intel-xe] ✗ CI.Build: failure " Patchwork
2023-03-02 14:57   ` Jani Nikula
2023-03-02 15:07     ` Jani Nikula
2023-03-03  6:28 ` [Intel-xe] [PATCH 0/8] drm/xe: clean up i915 includes both sides Lucas De Marchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230303061051.yfvv7u5oljxo7bh3@ldmartin-desk2.lan \
    --to=lucas.demarchi@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.