Commit a954e0a2 authored by Jani Nikula's avatar Jani Nikula

drm/i915/dp: convert intel_dp_tunnel.[ch] to struct intel_display

Going forward, struct intel_display shall replace struct
drm_i915_private as the main display device data pointer type. Convert
intel_dp_tunnel.[ch] to struct intel_display.
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c83fe739ab8de05361d6eaae0249e58878a3c06.1725012870.git.jani.nikula@intel.com
parent b34b43f9
...@@ -459,7 +459,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915) ...@@ -459,7 +459,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)
intel_vga_disable(i915); intel_vga_disable(i915);
intel_setup_outputs(i915); intel_setup_outputs(i915);
ret = intel_dp_tunnel_mgr_init(i915); ret = intel_dp_tunnel_mgr_init(display);
if (ret) if (ret)
goto err_hdcp; goto err_hdcp;
...@@ -580,6 +580,8 @@ void intel_display_driver_remove(struct drm_i915_private *i915) ...@@ -580,6 +580,8 @@ void intel_display_driver_remove(struct drm_i915_private *i915)
/* part #2: call after irq uninstall */ /* part #2: call after irq uninstall */
void intel_display_driver_remove_noirq(struct drm_i915_private *i915) void intel_display_driver_remove_noirq(struct drm_i915_private *i915)
{ {
struct intel_display *display = &i915->display;
if (!HAS_DISPLAY(i915)) if (!HAS_DISPLAY(i915))
return; return;
...@@ -600,7 +602,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915) ...@@ -600,7 +602,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)
intel_mode_config_cleanup(i915); intel_mode_config_cleanup(i915);
intel_dp_tunnel_mgr_cleanup(i915); intel_dp_tunnel_mgr_cleanup(display);
intel_overlay_cleanup(i915); intel_overlay_cleanup(i915);
......
...@@ -9,14 +9,13 @@ ...@@ -9,14 +9,13 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
struct drm_i915_private;
struct drm_connector_state; struct drm_connector_state;
struct drm_modeset_acquire_ctx; struct drm_modeset_acquire_ctx;
struct intel_atomic_state; struct intel_atomic_state;
struct intel_connector; struct intel_connector;
struct intel_crtc; struct intel_crtc;
struct intel_crtc_state; struct intel_crtc_state;
struct intel_display;
struct intel_dp; struct intel_dp;
struct intel_encoder; struct intel_encoder;
struct intel_link_bw_limits; struct intel_link_bw_limits;
...@@ -53,8 +52,8 @@ int intel_dp_tunnel_atomic_check_state(struct intel_atomic_state *state, ...@@ -53,8 +52,8 @@ int intel_dp_tunnel_atomic_check_state(struct intel_atomic_state *state,
void intel_dp_tunnel_atomic_alloc_bw(struct intel_atomic_state *state); void intel_dp_tunnel_atomic_alloc_bw(struct intel_atomic_state *state);
int intel_dp_tunnel_mgr_init(struct drm_i915_private *i915); int intel_dp_tunnel_mgr_init(struct intel_display *display);
void intel_dp_tunnel_mgr_cleanup(struct drm_i915_private *i915); void intel_dp_tunnel_mgr_cleanup(struct intel_display *display);
#else #else
...@@ -121,12 +120,12 @@ intel_dp_tunnel_atomic_alloc_bw(struct intel_atomic_state *state) ...@@ -121,12 +120,12 @@ intel_dp_tunnel_atomic_alloc_bw(struct intel_atomic_state *state)
} }
static inline int static inline int
intel_dp_tunnel_mgr_init(struct drm_i915_private *i915) intel_dp_tunnel_mgr_init(struct intel_display *display)
{ {
return 0; return 0;
} }
static inline void intel_dp_tunnel_mgr_cleanup(struct drm_i915_private *i915) {} static inline void intel_dp_tunnel_mgr_cleanup(struct intel_display *display) {}
#endif /* CONFIG_DRM_I915_DP_TUNNEL */ #endif /* CONFIG_DRM_I915_DP_TUNNEL */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment