With the intel_dpt.[ch] file names vacated, and i915 specific code moved
away, we can rename the intel_dpt_common.[ch] files to the simpler name.

Signed-off-by: Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/Makefile                                   | 2 +-
 drivers/gpu/drm/i915/display/intel_display.c                    | 2 +-
 .../gpu/drm/i915/display/{intel_dpt_common.c => intel_dpt.c}    | 2 +-
 .../gpu/drm/i915/display/{intel_dpt_common.h => intel_dpt.h}    | 0
 drivers/gpu/drm/i915/i915_driver.c                              | 2 +-
 drivers/gpu/drm/xe/Makefile                                     | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename drivers/gpu/drm/i915/display/{intel_dpt_common.c => intel_dpt.c} (98%)
 rename drivers/gpu/drm/i915/display/{intel_dpt_common.h => intel_dpt.h} (100%)

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 1d71ecb3ca83..5497249d9e2a 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -271,7 +271,7 @@ i915-y += \
        display/intel_dpio_phy.o \
        display/intel_dpll.o \
        display/intel_dpll_mgr.o \
-       display/intel_dpt_common.o \
+       display/intel_dpt.o \
        display/intel_dram.o \
        display/intel_drrs.o \
        display/intel_dsb.o \
diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 6df7593c29d5..3a57baee990d 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -85,7 +85,7 @@
 #include "intel_dp_tunnel.h"
 #include "intel_dpll.h"
 #include "intel_dpll_mgr.h"
-#include "intel_dpt_common.h"
+#include "intel_dpt.h"
 #include "intel_drrs.h"
 #include "intel_dsb.h"
 #include "intel_dsi.h"
diff --git a/drivers/gpu/drm/i915/display/intel_dpt_common.c 
b/drivers/gpu/drm/i915/display/intel_dpt.c
similarity index 98%
rename from drivers/gpu/drm/i915/display/intel_dpt_common.c
rename to drivers/gpu/drm/i915/display/intel_dpt.c
index 6551318b037b..dffd500d378e 100644
--- a/drivers/gpu/drm/i915/display/intel_dpt_common.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -6,7 +6,7 @@
 #include "intel_de.h"
 #include "intel_display_regs.h"
 #include "intel_display_types.h"
-#include "intel_dpt_common.h"
+#include "intel_dpt.h"
 #include "intel_parent.h"
 #include "skl_universal_plane_regs.h"
 
diff --git a/drivers/gpu/drm/i915/display/intel_dpt_common.h 
b/drivers/gpu/drm/i915/display/intel_dpt.h
similarity index 100%
rename from drivers/gpu/drm/i915/display/intel_dpt_common.h
rename to drivers/gpu/drm/i915/display/intel_dpt.h
diff --git a/drivers/gpu/drm/i915/i915_driver.c 
b/drivers/gpu/drm/i915/i915_driver.c
index e1c73f626b32..d4f71d02b90e 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -58,7 +58,7 @@
 #include "display/intel_display_power.h"
 #include "display/intel_dmc.h"
 #include "display/intel_dp.h"
-#include "display/intel_dpt_common.h"
+#include "display/intel_dpt.h"
 #include "display/intel_dram.h"
 #include "display/intel_encoder.h"
 #include "display/intel_fbdev.h"
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 41ec698b3cc1..8fc0c3678944 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -275,7 +275,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
        i915-display/intel_dp_test.o \
        i915-display/intel_dpll.o \
        i915-display/intel_dpll_mgr.o \
-       i915-display/intel_dpt_common.o \
+       i915-display/intel_dpt.o \
        i915-display/intel_dram.o \
        i915-display/intel_drrs.o \
        i915-display/intel_dsb.o \
-- 
2.47.3

Reply via email to