Commit 40053823 authored by Jani Nikula's avatar Jani Nikula

drm/i915/display: move modeset probe/remove functions to intel_display_driver.c

High level display functionality only called from driver top level code.

v2:
- Remove unnecessary declarations for intel_sanitize_watermarks() and
  intel_atomic_check() (Gustavo)
Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c00df5cfc233520bc28dd972296197a8a619a6a0.1681465222.git.jani.nikula@intel.com
parent 15e4f0b5
...@@ -63,6 +63,7 @@ struct intel_power_domain_mask; ...@@ -63,6 +63,7 @@ struct intel_power_domain_mask;
struct intel_remapped_info; struct intel_remapped_info;
struct intel_rotation_info; struct intel_rotation_info;
struct pci_dev; struct pci_dev;
struct work_struct;
#define pipe_name(p) ((p) + 'A') #define pipe_name(p) ((p) + 'A')
...@@ -521,13 +522,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state); ...@@ -521,13 +522,6 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);
void intel_update_watermarks(struct drm_i915_private *i915); void intel_update_watermarks(struct drm_i915_private *i915);
/* modesetting */ /* modesetting */
void intel_modeset_init_hw(struct drm_i915_private *i915);
int intel_modeset_init_noirq(struct drm_i915_private *i915);
int intel_modeset_init_nogem(struct drm_i915_private *i915);
int intel_modeset_init(struct drm_i915_private *i915);
void intel_modeset_driver_remove(struct drm_i915_private *i915);
void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915);
void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915);
void intel_display_resume(struct drm_device *dev); void intel_display_resume(struct drm_device *dev);
int intel_modeset_all_pipes(struct intel_atomic_state *state, int intel_modeset_all_pipes(struct intel_atomic_state *state,
const char *reason); const char *reason);
...@@ -536,6 +530,19 @@ void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state, ...@@ -536,6 +530,19 @@ void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,
void intel_modeset_put_crtc_power_domains(struct intel_crtc *crtc, void intel_modeset_put_crtc_power_domains(struct intel_crtc *crtc,
struct intel_power_domain_mask *domains); struct intel_power_domain_mask *domains);
/* interface for intel_display_driver.c */
void intel_setup_outputs(struct drm_i915_private *i915);
int intel_initial_commit(struct drm_device *dev);
void intel_panel_sanitize_ssc(struct drm_i915_private *i915);
void intel_update_czclk(struct drm_i915_private *i915);
void intel_atomic_helper_free_state_worker(struct work_struct *work);
enum drm_mode_status intel_mode_valid(struct drm_device *dev,
const struct drm_display_mode *mode);
int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
bool nonblock);
void intel_hpd_poll_fini(struct drm_i915_private *i915);
/* modesetting asserts */ /* modesetting asserts */
void assert_transcoder(struct drm_i915_private *dev_priv, void assert_transcoder(struct drm_i915_private *dev_priv,
enum transcoder cpu_transcoder, bool state); enum transcoder cpu_transcoder, bool state);
......
...@@ -12,7 +12,14 @@ struct drm_i915_private; ...@@ -12,7 +12,14 @@ struct drm_i915_private;
struct pci_dev; struct pci_dev;
bool intel_display_driver_probe_defer(struct pci_dev *pdev); bool intel_display_driver_probe_defer(struct pci_dev *pdev);
void intel_modeset_init_hw(struct drm_i915_private *i915);
int intel_modeset_init_noirq(struct drm_i915_private *i915);
int intel_modeset_init_nogem(struct drm_i915_private *i915);
int intel_modeset_init(struct drm_i915_private *i915);
void intel_display_driver_register(struct drm_i915_private *i915); void intel_display_driver_register(struct drm_i915_private *i915);
void intel_modeset_driver_remove(struct drm_i915_private *i915);
void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915);
void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915);
void intel_display_driver_unregister(struct drm_i915_private *i915); void intel_display_driver_unregister(struct drm_i915_private *i915);
#endif /* __INTEL_DISPLAY_DRIVER_H__ */ #endif /* __INTEL_DISPLAY_DRIVER_H__ */
......
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