Commit 7c53e628 authored by Jani Nikula's avatar Jani Nikula

drm/i915/display: move crtc and dpll declarations where they belong

The definitions are in the crtc and dpll files; move the declarations to
the corresponding headers.
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/20210427120315.12342-1-jani.nikula@intel.com
parent b23109c5
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "intel_atomic.h" #include "intel_atomic.h"
#include "intel_combo_phy.h" #include "intel_combo_phy.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_crtc.h"
#include "intel_ddi.h" #include "intel_ddi.h"
#include "intel_dsi.h" #include "intel_dsi.h"
#include "intel_panel.h" #include "intel_panel.h"
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_crt.h" #include "intel_crt.h"
#include "intel_crtc.h"
#include "intel_ddi.h" #include "intel_ddi.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_fdi.h" #include "intel_fdi.h"
......
...@@ -18,5 +18,8 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe); ...@@ -18,5 +18,8 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe);
struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc); struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, void intel_crtc_state_reset(struct intel_crtc_state *crtc_state,
struct intel_crtc *crtc); struct intel_crtc *crtc);
u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state);
void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);
#endif #endif
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "intel_audio.h" #include "intel_audio.h"
#include "intel_combo_phy.h" #include "intel_combo_phy.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_crtc.h"
#include "intel_ddi.h" #include "intel_ddi.h"
#include "intel_ddi_buf_trans.h" #include "intel_ddi_buf_trans.h"
#include "intel_display_types.h" #include "intel_display_types.h"
......
...@@ -557,9 +557,6 @@ enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv, ...@@ -557,9 +557,6 @@ enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv,
enum port port); enum port port);
int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data, int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state);
void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);
int ilk_get_lanes_required(int target_clock, int link_bw, int bpp); int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);
void vlv_wait_port_ready(struct drm_i915_private *dev_priv, void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
...@@ -598,9 +595,6 @@ void intel_dp_get_m_n(struct intel_crtc *crtc, ...@@ -598,9 +595,6 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,
void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state, void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,
enum link_m_n_set m_n); enum link_m_n_set m_n);
int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n);
bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state,
struct dpll *best_clock);
int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state); bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state);
void hsw_enable_ips(const struct intel_crtc_state *crtc_state); void hsw_enable_ips(const struct intel_crtc_state *crtc_state);
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "intel_atomic.h" #include "intel_atomic.h"
#include "intel_audio.h" #include "intel_audio.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_crtc.h"
#include "intel_ddi.h" #include "intel_ddi.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_dp.h" #include "intel_dp.h"
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef _INTEL_DPLL_H_ #ifndef _INTEL_DPLL_H_
#define _INTEL_DPLL_H_ #define _INTEL_DPLL_H_
#include <linux/types.h>
struct dpll; struct dpll;
struct drm_i915_private; struct drm_i915_private;
struct intel_crtc; struct intel_crtc;
...@@ -37,5 +39,8 @@ void vlv_prepare_pll(struct intel_crtc *crtc, ...@@ -37,5 +39,8 @@ void vlv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config); const struct intel_crtc_state *pipe_config);
void chv_prepare_pll(struct intel_crtc *crtc, void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config); const struct intel_crtc_state *pipe_config);
bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state,
struct dpll *best_clock);
int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
#endif #endif
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_dpio_phy.h" #include "intel_dpio_phy.h"
#include "intel_dpll.h"
#include "intel_dpll_mgr.h" #include "intel_dpll_mgr.h"
/** /**
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_atomic.h" #include "intel_atomic.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_crtc.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_fifo_underrun.h" #include "intel_fifo_underrun.h"
#include "intel_gmbus.h" #include "intel_gmbus.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_atomic.h" #include "intel_atomic.h"
#include "intel_connector.h" #include "intel_connector.h"
#include "intel_crtc.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_dsi.h" #include "intel_dsi.h"
#include "intel_fifo_underrun.h" #include "intel_fifo_underrun.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <drm/drm_drv.h> #include <drm/drm_drv.h>
#include "display/intel_crtc.h"
#include "display/intel_display_types.h" #include "display/intel_display_types.h"
#include "gt/intel_engine.h" #include "gt/intel_engine.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