drm/i915/display: add intel_display -> drm_device backpointer

As a baby step towards making struct intel_display the main data
structure for display, add a backpointer to struct drm_device that can
be used instead of &i915->drm.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/47dd7bc4aae3c10b18097824e37617c072c66c0b.1713358679.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 9d89828e87df5a808369e49ac560286aa921b430..7715fc329057aa723e41da71c604dc11ff362adf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -283,6 +283,9 @@ struct intel_wm {
 };
 
 struct intel_display {
+       /* drm device backpointer */
+       struct drm_device *drm;
+
        /* Display functions */
        struct {
                /* Top level crtc-ish functions */

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index b8903bd0e82ab47396471daf272f8b63e5653052..120e209ee74af2f4ab3e8f4e586d4efcb66c96fc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -927,6 +927,9 @@ void intel_display_device_probe(struct drm_i915_private *i915)
        const struct intel_display_device_info *info;
        u16 ver, rel, step;
 
+       /* Add drm device backpointer as early as possible. */
+       i915->display.drm = &i915->drm;
+
        if (HAS_GMD_ID(i915))
                info = probe_gmdid_display(i915, &ver, &rel, &step);
        else