drm/i915/dpt: convert intel_dpt_common.c to struct intel_display

Remove the last uses of struct drm_i915_private from intel_dpt_common.c,
and drop the dependency on i915_drv.h.

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/7bc340e05c535479b0f0698372835ba04fd5c8f8.1746175756.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dpt_common.c b/drivers/gpu/drm/i915/display/intel_dpt_common.c
index d2dede0a5229c106910ca504550e41f480e35a11..ce5aa0ca0fa5356db645a4f7581865d9c42d9b4e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt_common.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt_common.c
@@ -3,7 +3,6 @@
  * Copyright © 2023 Intel Corporation
  */
 
-#include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
@@ -12,9 +11,9 @@
 
 void intel_dpt_configure(struct intel_crtc *crtc)
 {
-       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+       struct intel_display *display = to_intel_display(crtc);
 
-       if (DISPLAY_VER(i915) == 14) {
+       if (DISPLAY_VER(display) == 14) {
                enum pipe pipe = crtc->pipe;
                enum plane_id plane_id;
 
@@ -22,15 +21,15 @@ void intel_dpt_configure(struct intel_crtc *crtc)
                        if (plane_id == PLANE_CURSOR)
                                continue;
 
-                       intel_de_rmw(i915, PLANE_CHICKEN(pipe, plane_id),
+                       intel_de_rmw(display, PLANE_CHICKEN(pipe, plane_id),
                                     PLANE_CHICKEN_DISABLE_DPT,
-                                    i915->display.params.enable_dpt ? 0 :
+                                    display->params.enable_dpt ? 0 :
                                     PLANE_CHICKEN_DISABLE_DPT);
                }
-       } else if (DISPLAY_VER(i915) == 13) {
-               intel_de_rmw(i915, CHICKEN_MISC_2,
+       } else if (DISPLAY_VER(display) == 13) {
+               intel_de_rmw(display, CHICKEN_MISC_2,
                             CHICKEN_MISC_DISABLE_DPT,
-                            i915->display.params.enable_dpt ? 0 :
+                            display->params.enable_dpt ? 0 :
                             CHICKEN_MISC_DISABLE_DPT);
        }
 }