[Intel-xe] [PATCH 1/8] drm/i915/display: don't use relative ../i915 includes

[Lucas De Marchi]

On Thu, Mar 02, 2023 at 04:12:23PM +0200, Jani Nikula wrote:
>We can't have this in upstream i915, so don't try that here either.
>
>Note: This should be squashed to the commit adding the relative
>includes.

is this a requirement?  I think squashing this is not very problematic,
but it may not work as the build infra with the different -I also
changes in the tree.

I'm also wondering why we have these changes at all in the xe side. Was
it maybe a temporary solution not needed anymore due to the -I added to
the build system?

Another idea would be not to squash it now, but only at the end
with all the i915 changes together.

>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

thanks
Lucas De Marchi

>---
> drivers/gpu/drm/i915/display/intel_backlight.c     | 2 +-
> drivers/gpu/drm/i915/display/intel_bw.c            | 2 +-
> drivers/gpu/drm/i915/display/intel_cdclk.c         | 4 ++--
> drivers/gpu/drm/i915/display/intel_display_power.c | 2 +-
> drivers/gpu/drm/i915/display/intel_gmbus.c         | 2 +-
> drivers/gpu/drm/i915/display/intel_opregion.c      | 2 +-
> drivers/gpu/drm/i915/display/skl_watermark.c       | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
>index e63eb43622e0..5b7da72c95b8 100644
>--- a/drivers/gpu/drm/i915/display/intel_backlight.c
>+++ b/drivers/gpu/drm/i915/display/intel_backlight.c
>@@ -19,7 +19,7 @@
> #include "intel_dp_aux_backlight.h"
> #include "intel_dsi_dcs_backlight.h"
> #include "intel_panel.h"
>-#include "../i915/intel_pci_config.h"
>+#include "intel_pci_config.h"
> #include "intel_pps.h"
> #include "intel_quirks.h"
>
>diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
>index 67b4e947589c..54e03a3eaa0f 100644
>--- a/drivers/gpu/drm/i915/display/intel_bw.c
>+++ b/drivers/gpu/drm/i915/display/intel_bw.c
>@@ -15,7 +15,7 @@
> #include "intel_display_core.h"
> #include "intel_display_types.h"
> #include "skl_watermark.h"
>-#include "../i915/intel_mchbar_regs.h"
>+#include "intel_mchbar_regs.h"
>
> /* Parameters for Qclk Geyserville (QGV) */
> struct intel_qgv_point {
>diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
>index 3b6a37403f25..ecb87542ebb6 100644
>--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
>+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
>@@ -32,8 +32,8 @@
> #include "intel_crtc.h"
> #include "intel_de.h"
> #include "intel_display_types.h"
>-#include "../i915/intel_mchbar_regs.h"
>-#include "../i915/intel_pci_config.h"
>+#include "intel_mchbar_regs.h"
>+#include "intel_pci_config.h"
> #include "intel_psr.h"
>
> #ifdef I915
>diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
>index 00e32a423708..3315d2bbebc7 100644
>--- a/drivers/gpu/drm/i915/display/intel_display_power.c
>+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
>@@ -16,7 +16,7 @@
> #include "intel_display_power_well.h"
> #include "intel_display_types.h"
> #include "intel_dmc.h"
>-#include "../i915/intel_mchbar_regs.h"
>+#include "intel_mchbar_regs.h"
> #include "intel_pch_refclk.h"
> #include "intel_snps_phy.h"
> #include "skl_watermark.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
>index 2d099f4c52cd..0bc4f6b48e80 100644
>--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
>+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
>@@ -39,7 +39,7 @@
> #include "intel_de.h"
> #include "intel_display_types.h"
> #include "intel_gmbus.h"
>-#include "../i915/display/intel_gmbus_regs.h"
>+#include "intel_gmbus_regs.h"
>
> struct intel_gmbus {
> 	struct i2c_adapter adapter;
>diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
>index 057a68237efe..e0184745632c 100644
>--- a/drivers/gpu/drm/i915/display/intel_opregion.c
>+++ b/drivers/gpu/drm/i915/display/intel_opregion.c
>@@ -37,7 +37,7 @@
> #include "intel_backlight.h"
> #include "intel_display_types.h"
> #include "intel_opregion.h"
>-#include "../i915/intel_pci_config.h"
>+#include "intel_pci_config.h"
>
> #define OPREGION_HEADER_OFFSET 0
> #define OPREGION_ACPI_OFFSET   0x100
>diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
>index 381d4f75e7c8..e254fb21b47f 100644
>--- a/drivers/gpu/drm/i915/display/skl_watermark.c
>+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
>@@ -16,7 +16,7 @@
> #include "skl_watermark.h"
>
> #include "i915_drv.h"
>-#include "../i915/i915_fixed.h"
>+#include "i915_fixed.h"
> #include "i915_reg.h"
> #include "intel_pm.h"
>
>-- 
>2.39.1
>