All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com, lucas.demarchi@intel.com
Subject: [Intel-xe] [PATCH 2/8] drm/i915/display: drop redundant display/ from includes
Date: Thu,  2 Mar 2023 16:12:24 +0200	[thread overview]
Message-ID: <20230302141230.2804699-3-jani.nikula@intel.com> (raw)
In-Reply-To: <20230302141230.2804699-1-jani.nikula@intel.com>

Already done in upstream i915.

Note: This would be dropped when rebasing against upstream.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 48 ++++++++++----------
 drivers/gpu/drm/i915/display/intel_psr.c     |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5a0a8179b0dc..81c50b6f1b5e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -45,32 +45,32 @@
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_rect.h>
 
-#include "display/intel_audio.h"
-#include "display/intel_backlight.h"
-#include "display/intel_ddi.h"
-#include "display/intel_display_debugfs.h"
-#include "display/intel_display_power.h"
-#include "display/intel_dp.h"
-#include "display/intel_dp_mst.h"
-#include "display/intel_dpll.h"
-#include "display/intel_dpll_mgr.h"
-#include "display/intel_drrs.h"
-#include "display/intel_dsb.h"
-#include "display/intel_dsi.h"
-#include "display/intel_fb.h"
-#include "display/intel_gmbus.h"
-#include "display/intel_hdmi.h"
-#include "display/intel_lvds.h"
-#include "display/intel_snps_phy.h"
-#include "display/intel_vdsc.h"
-#include "display/intel_vrr.h"
+#include "intel_audio.h"
+#include "intel_backlight.h"
+#include "intel_ddi.h"
+#include "intel_display_debugfs.h"
+#include "intel_display_power.h"
+#include "intel_dp.h"
+#include "intel_dp_mst.h"
+#include "intel_dpll.h"
+#include "intel_dpll_mgr.h"
+#include "intel_drrs.h"
+#include "intel_dsb.h"
+#include "intel_dsi.h"
+#include "intel_fb.h"
+#include "intel_gmbus.h"
+#include "intel_hdmi.h"
+#include "intel_lvds.h"
+#include "intel_snps_phy.h"
+#include "intel_vdsc.h"
+#include "intel_vrr.h"
 
 #ifdef I915
-#include "display/intel_crt.h"
-#include "display/intel_dvo.h"
-#include "display/intel_overlay.h"
-#include "display/intel_sdvo.h"
-#include "display/intel_tv.h"
+#include "intel_crt.h"
+#include "intel_dvo.h"
+#include "intel_overlay.h"
+#include "intel_sdvo.h"
+#include "intel_tv.h"
 
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_object.h"
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index bc998b526d88..195ddafdb522 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -24,7 +24,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_damage_helper.h>
 
-#include "display/intel_dp.h"
+#include "intel_dp.h"
 
 #include "i915_drv.h"
 #include "i915_reg.h"
-- 
2.39.1


  parent reply	other threads:[~2023-03-02 14:23 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 ` Jani Nikula [this message]
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
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=20230302141230.2804699-3-jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=lucas.demarchi@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.