drm/i915/dpt: drop _common from the DPT file names

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.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patch.msgid.link/3f2da737a26bb71a7bc05a3e6c456302e3c72656.1772030909.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index f1f504b36374d0cf34882359b7d015edf8c69558..1c7c7687033c4f57ebab416e7f36bf383067c064 100644 (file)
--- 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 24ea9c2b28ad1dd7a1b644cb1884497830b7c5f1..27354585ba92693405c202d71b624903c1c70579 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -84,7 +84,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.c b/drivers/gpu/drm/i915/display/intel_dpt.c
new file mode 100644 (file)
index 0000000..dffd500
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#include "intel_de.h"
+#include "intel_display_regs.h"
+#include "intel_display_types.h"
+#include "intel_dpt.h"
+#include "intel_parent.h"
+#include "skl_universal_plane_regs.h"
+
+void intel_dpt_configure(struct intel_crtc *crtc)
+{
+       struct intel_display *display = to_intel_display(crtc);
+
+       if (DISPLAY_VER(display) == 14) {
+               enum pipe pipe = crtc->pipe;
+               enum plane_id plane_id;
+
+               for_each_plane_id_on_crtc(crtc, plane_id) {
+                       if (plane_id == PLANE_CURSOR)
+                               continue;
+
+                       intel_de_rmw(display, PLANE_CHICKEN(pipe, plane_id),
+                                    PLANE_CHICKEN_DISABLE_DPT,
+                                    display->params.enable_dpt ? 0 :
+                                    PLANE_CHICKEN_DISABLE_DPT);
+               }
+       } else if (DISPLAY_VER(display) == 13) {
+               intel_de_rmw(display, CHICKEN_MISC_2,
+                            CHICKEN_MISC_DISABLE_DPT,
+                            display->params.enable_dpt ? 0 :
+                            CHICKEN_MISC_DISABLE_DPT);
+       }
+}
+
+/**
+ * intel_dpt_suspend - suspend the memory mapping for all DPT FBs during system suspend
+ * @display: display device instance
+ *
+ * Suspend the memory mapping during system suspend for all framebuffers which
+ * are mapped to HW via a GGTT->DPT page table.
+ *
+ * This function must be called before the mappings in GGTT are suspended calling
+ * i915_ggtt_suspend().
+ */
+void intel_dpt_suspend(struct intel_display *display)
+{
+       struct drm_framebuffer *drm_fb;
+
+       if (!HAS_DISPLAY(display))
+               return;
+
+       mutex_lock(&display->drm->mode_config.fb_lock);
+
+       drm_for_each_fb(drm_fb, display->drm) {
+               struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);
+
+               if (fb->dpt_vm)
+                       intel_parent_dpt_suspend(display, fb->dpt_vm);
+       }
+
+       mutex_unlock(&display->drm->mode_config.fb_lock);
+}
+
+/**
+ * intel_dpt_resume - restore the memory mapping for all DPT FBs during system resume
+ * @display: display device instance
+ *
+ * Restore the memory mapping during system resume for all framebuffers which
+ * are mapped to HW via a GGTT->DPT page table. The content of these page
+ * tables are not stored in the hibernation image during S4 and S3RST->S4
+ * transitions, so here we reprogram the PTE entries in those tables.
+ *
+ * This function must be called after the mappings in GGTT have been restored calling
+ * i915_ggtt_resume().
+ */
+void intel_dpt_resume(struct intel_display *display)
+{
+       struct drm_framebuffer *drm_fb;
+
+       if (!HAS_DISPLAY(display))
+               return;
+
+       mutex_lock(&display->drm->mode_config.fb_lock);
+       drm_for_each_fb(drm_fb, display->drm) {
+               struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);
+
+               if (fb->dpt_vm)
+                       intel_parent_dpt_resume(display, fb->dpt_vm);
+       }
+       mutex_unlock(&display->drm->mode_config.fb_lock);
+}

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.h b/drivers/gpu/drm/i915/display/intel_dpt.h
new file mode 100644 (file)
index 0000000..11bd495
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_dpt.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef __INTEL_DPT_COMMON_H__
+#define __INTEL_DPT_COMMON_H__
+
+struct intel_crtc;
+struct intel_display;
+
+void intel_dpt_configure(struct intel_crtc *crtc);
+void intel_dpt_suspend(struct intel_display *display);
+void intel_dpt_resume(struct intel_display *display);
+
+#endif /* __INTEL_DPT_COMMON_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_dpt_common.c b/drivers/gpu/drm/i915/display/intel_dpt_common.c
deleted file mode 100644 (file)
index 6551318..0000000
--- a/drivers/gpu/drm/i915/display/intel_dpt_common.c
+++ /dev/null
@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: MIT
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#include "intel_de.h"
-#include "intel_display_regs.h"
-#include "intel_display_types.h"
-#include "intel_dpt_common.h"
-#include "intel_parent.h"
-#include "skl_universal_plane_regs.h"
-
-void intel_dpt_configure(struct intel_crtc *crtc)
-{
-       struct intel_display *display = to_intel_display(crtc);
-
-       if (DISPLAY_VER(display) == 14) {
-               enum pipe pipe = crtc->pipe;
-               enum plane_id plane_id;
-
-               for_each_plane_id_on_crtc(crtc, plane_id) {
-                       if (plane_id == PLANE_CURSOR)
-                               continue;
-
-                       intel_de_rmw(display, PLANE_CHICKEN(pipe, plane_id),
-                                    PLANE_CHICKEN_DISABLE_DPT,
-                                    display->params.enable_dpt ? 0 :
-                                    PLANE_CHICKEN_DISABLE_DPT);
-               }
-       } else if (DISPLAY_VER(display) == 13) {
-               intel_de_rmw(display, CHICKEN_MISC_2,
-                            CHICKEN_MISC_DISABLE_DPT,
-                            display->params.enable_dpt ? 0 :
-                            CHICKEN_MISC_DISABLE_DPT);
-       }
-}
-
-/**
- * intel_dpt_suspend - suspend the memory mapping for all DPT FBs during system suspend
- * @display: display device instance
- *
- * Suspend the memory mapping during system suspend for all framebuffers which
- * are mapped to HW via a GGTT->DPT page table.
- *
- * This function must be called before the mappings in GGTT are suspended calling
- * i915_ggtt_suspend().
- */
-void intel_dpt_suspend(struct intel_display *display)
-{
-       struct drm_framebuffer *drm_fb;
-
-       if (!HAS_DISPLAY(display))
-               return;
-
-       mutex_lock(&display->drm->mode_config.fb_lock);
-
-       drm_for_each_fb(drm_fb, display->drm) {
-               struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);
-
-               if (fb->dpt_vm)
-                       intel_parent_dpt_suspend(display, fb->dpt_vm);
-       }
-
-       mutex_unlock(&display->drm->mode_config.fb_lock);
-}
-
-/**
- * intel_dpt_resume - restore the memory mapping for all DPT FBs during system resume
- * @display: display device instance
- *
- * Restore the memory mapping during system resume for all framebuffers which
- * are mapped to HW via a GGTT->DPT page table. The content of these page
- * tables are not stored in the hibernation image during S4 and S3RST->S4
- * transitions, so here we reprogram the PTE entries in those tables.
- *
- * This function must be called after the mappings in GGTT have been restored calling
- * i915_ggtt_resume().
- */
-void intel_dpt_resume(struct intel_display *display)
-{
-       struct drm_framebuffer *drm_fb;
-
-       if (!HAS_DISPLAY(display))
-               return;
-
-       mutex_lock(&display->drm->mode_config.fb_lock);
-       drm_for_each_fb(drm_fb, display->drm) {
-               struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);
-
-               if (fb->dpt_vm)
-                       intel_parent_dpt_resume(display, fb->dpt_vm);
-       }
-       mutex_unlock(&display->drm->mode_config.fb_lock);
-}

diff --git a/drivers/gpu/drm/i915/display/intel_dpt_common.h b/drivers/gpu/drm/i915/display/intel_dpt_common.h
deleted file mode 100644 (file)
index 11bd495..0000000
--- a/drivers/gpu/drm/i915/display/intel_dpt_common.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#ifndef __INTEL_DPT_COMMON_H__
-#define __INTEL_DPT_COMMON_H__
-
-struct intel_crtc;
-struct intel_display;
-
-void intel_dpt_configure(struct intel_crtc *crtc);
-void intel_dpt_suspend(struct intel_display *display);
-void intel_dpt_resume(struct intel_display *display);
-
-#endif /* __INTEL_DPT_COMMON_H__ */

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 570626f8a55415f2000bc330190d837c9f9b2f10..31a608ccab007e30783e82bcef25a1efdb44c358 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -59,7 +59,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 51a9a531fb7ec66894699104fbeb36a6b81e3880..a630466b3d72de24d1ebbbbe38a5cac3f3ddc11f 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -274,7 +274,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 \