drm/i915/display: Separate xe and i915 common dpt code into own file

Here created intel_dpt_common.c to hold intel_dpt_configure which is
needed for both xe and i915.

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231116150225.204233-1-juhapekka.heikkila@gmail.com

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 7e5d6a39d4503aad0874138c27ce64d402cf065f..65e984242089c74c0a96c428795ad560a8c1d8aa 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -275,6 +275,7 @@ i915-y += \
        display/intel_dpll.o \
        display/intel_dpll_mgr.o \
        display/intel_dpt.o \
+       display/intel_dpt_common.o \
        display/intel_drrs.o \
        display/intel_dsb.o \
        display/intel_dsb_buffer.o \

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cf338ac71229c2af29909d042f96409e32a90e63..5cf162628b95e0ff50af28f9ea057b0dea6a293f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -76,6 +76,7 @@
 #include "intel_dpll.h"
 #include "intel_dpll_mgr.h"
 #include "intel_dpt.h"
+#include "intel_dpt_common.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
index 2b067cb952f001563fb0b19e4f75d4eb71b06547..b29bceff73f23f2f0bda60d99dc6101b82996624 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -9,8 +9,6 @@
 #include "gt/gen8_ppgtt.h"
 
 #include "i915_drv.h"
-#include "i915_reg.h"
-#include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_dpt.h"
 #include "intel_fb.h"
@@ -318,27 +316,3 @@ void intel_dpt_destroy(struct i915_address_space *vm)
        i915_vm_put(&dpt->vm);
 }
 
-void intel_dpt_configure(struct intel_crtc *crtc)
-{
-       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
-
-       if (DISPLAY_VER(i915) == 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(i915, PLANE_CHICKEN(pipe, plane_id),
-                                    PLANE_CHICKEN_DISABLE_DPT,
-                                    i915->display.params.enable_dpt ? 0 :
-                                    PLANE_CHICKEN_DISABLE_DPT);
-               }
-       } else if (DISPLAY_VER(i915) == 13) {
-               intel_de_rmw(i915, CHICKEN_MISC_2,
-                            CHICKEN_MISC_DISABLE_DPT,
-                            i915->display.params.enable_dpt ? 0 :
-                            CHICKEN_MISC_DISABLE_DPT);
-       }
-}

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.h b/drivers/gpu/drm/i915/display/intel_dpt.h
index d9a16655018514f8b3d3b5adec9a0d552f50c8d5..e18a9f767b112ab8ec4961497c8c0c6536b3e9be 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.h
+++ b/drivers/gpu/drm/i915/display/intel_dpt.h
@@ -10,7 +10,6 @@ struct drm_i915_private;
 
 struct i915_address_space;
 struct i915_vma;
-struct intel_crtc;
 struct intel_framebuffer;
 
 void intel_dpt_destroy(struct i915_address_space *vm);
@@ -20,6 +19,5 @@ void intel_dpt_suspend(struct drm_i915_private *i915);
 void intel_dpt_resume(struct drm_i915_private *i915);
 struct i915_address_space *
 intel_dpt_create(struct intel_framebuffer *fb);
-void intel_dpt_configure(struct intel_crtc *crtc);
 
 #endif /* __INTEL_DPT_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_dpt_common.c b/drivers/gpu/drm/i915/display/intel_dpt_common.c
new file mode 100644 (file)
index 0000000..cdba471
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_dpt_common.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#include "i915_reg.h"
+#include "intel_de.h"
+#include "intel_display_types.h"
+#include "intel_dpt_common.h"
+
+void intel_dpt_configure(struct intel_crtc *crtc)
+{
+       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+
+       if (DISPLAY_VER(i915) == 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(i915, PLANE_CHICKEN(pipe, plane_id),
+                                    PLANE_CHICKEN_DISABLE_DPT,
+                                    i915->display.params.enable_dpt ? 0 :
+                                    PLANE_CHICKEN_DISABLE_DPT);
+               }
+       } else if (DISPLAY_VER(i915) == 13) {
+               intel_de_rmw(i915, CHICKEN_MISC_2,
+                            CHICKEN_MISC_DISABLE_DPT,
+                            i915->display.params.enable_dpt ? 0 :
+                            CHICKEN_MISC_DISABLE_DPT);
+       }
+}

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