drm/i915/dpt: convert intel_dpt.[ch] interfaces to struct intel_display

Going forward, struct intel_display is the main display device data
pointer. Convert the intel_dpt.[ch] interfaces to struct intel_display,
though the file being very i915 specific, it's hard to convert the
implementation.

Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/df2bf715639caeb662f08b776ba81bfe3c9288b9.1740502116.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
index 8b1f0e92a11cc28b5b341e7e5d73368823b85bc0..fca7294b1def8810f1c326a5d9bbc1a706e04473 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -183,7 +183,7 @@ void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm)
 
 /**
  * intel_dpt_resume - restore the memory mapping for all DPT FBs during system resume
- * @i915: device instance
+ * @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
@@ -193,26 +193,26 @@ void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm)
  * This function must be called after the mappings in GGTT have been restored calling
  * i915_ggtt_resume().
  */
-void intel_dpt_resume(struct drm_i915_private *i915)
+void intel_dpt_resume(struct intel_display *display)
 {
        struct drm_framebuffer *drm_fb;
 
-       if (!HAS_DISPLAY(i915))
+       if (!HAS_DISPLAY(display))
                return;
 
-       mutex_lock(&i915->drm.mode_config.fb_lock);
-       drm_for_each_fb(drm_fb, &i915->drm) {
+       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)
                        i915_ggtt_resume_vm(fb->dpt_vm, true);
        }
-       mutex_unlock(&i915->drm.mode_config.fb_lock);
+       mutex_unlock(&display->drm->mode_config.fb_lock);
 }
 
 /**
  * intel_dpt_suspend - suspend the memory mapping for all DPT FBs during system suspend
- * @i915: device instance
+ * @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.
@@ -220,23 +220,23 @@ void intel_dpt_resume(struct drm_i915_private *i915)
  * This function must be called before the mappings in GGTT are suspended calling
  * i915_ggtt_suspend().
  */
-void intel_dpt_suspend(struct drm_i915_private *i915)
+void intel_dpt_suspend(struct intel_display *display)
 {
        struct drm_framebuffer *drm_fb;
 
-       if (!HAS_DISPLAY(i915))
+       if (!HAS_DISPLAY(display))
                return;
 
-       mutex_lock(&i915->drm.mode_config.fb_lock);
+       mutex_lock(&display->drm->mode_config.fb_lock);
 
-       drm_for_each_fb(drm_fb, &i915->drm) {
+       drm_for_each_fb(drm_fb, display->drm) {
                struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);
 
                if (fb->dpt_vm)
                        i915_ggtt_suspend_vm(fb->dpt_vm, true);
        }
 
-       mutex_unlock(&i915->drm.mode_config.fb_lock);
+       mutex_unlock(&display->drm->mode_config.fb_lock);
 }
 
 struct i915_address_space *

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.h b/drivers/gpu/drm/i915/display/intel_dpt.h
index 1f88b0ee17e7ee8e0ef579eff8a720d1edc0482d..db521401b828fba15633b7327b51f6b10c639da2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.h
+++ b/drivers/gpu/drm/i915/display/intel_dpt.h
@@ -8,18 +8,17 @@
 
 #include <linux/types.h>
 
-struct drm_i915_private;
-
 struct i915_address_space;
 struct i915_vma;
+struct intel_display;
 struct intel_framebuffer;
 
 void intel_dpt_destroy(struct i915_address_space *vm);
 struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
                                       unsigned int alignment);
 void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm);
-void intel_dpt_suspend(struct drm_i915_private *i915);
-void intel_dpt_resume(struct drm_i915_private *i915);
+void intel_dpt_suspend(struct intel_display *display);
+void intel_dpt_resume(struct intel_display *display);
 struct i915_address_space *
 intel_dpt_create(struct intel_framebuffer *fb);
 u64 intel_dpt_offset(struct i915_vma *dpt_vma);

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 91a7748f4492620f0bd40aafdf3e76e170dc8422..ccdfa137c2e0415026539b7c2afa5a5cf86c56db 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1075,7 +1075,7 @@ static int i915_drm_suspend(struct drm_device *dev)
        intel_encoder_suspend_all(&dev_priv->display);
 
        /* Must be called before GGTT is suspended. */
-       intel_dpt_suspend(dev_priv);
+       intel_dpt_suspend(display);
        i915_ggtt_suspend(to_gt(dev_priv)->ggtt);
 
        i9xx_display_sr_save(display);
@@ -1192,7 +1192,7 @@ static int i915_drm_resume(struct drm_device *dev)
                        setup_private_pat(gt);
 
        /* Must be called after GGTT is resumed. */
-       intel_dpt_resume(dev_priv);
+       intel_dpt_resume(display);
 
        intel_dmc_resume(display);