Skip to content

Commit c2a9fcd

Browse files
author
Ander Conselvan de Oliveira
committed
drm/i915: Move shared dpll function prototypes to intel_dpll_mgr.h
Move shared dpll function prototype together with other shared dpll definitions. Signed-off-by: Ander Conselvan de Oliveira <[email protected]> Reviewed-by: Maarten Lankhorst <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/1457451987-17466-7-git-send-email-ander.conselvan.de.oliveira@intel.com
1 parent ac7f11c commit c2a9fcd

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

drivers/gpu/drm/i915/intel_dpll_mgr.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#define _INTEL_DPLL_MGR_H_
2727

2828
struct drm_i915_private;
29+
struct intel_crtc;
30+
struct intel_crtc_state;
2931

3032
enum intel_dpll_id {
3133
DPLL_ID_PRIVATE = -1, /* non-shared dpll in use */
@@ -102,5 +104,33 @@ struct intel_shared_dpll {
102104
#define SKL_DPLL2 2
103105
#define SKL_DPLL3 3
104106

107+
/* shared dpll functions */
108+
struct intel_shared_dpll *
109+
intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,
110+
enum intel_dpll_id id);
111+
enum intel_dpll_id
112+
intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,
113+
struct intel_shared_dpll *pll);
114+
void
115+
intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,
116+
struct intel_shared_dpll *pll,
117+
struct intel_crtc *crtc);
118+
void
119+
intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,
120+
struct intel_shared_dpll *pll,
121+
struct intel_crtc *crtc);
122+
void assert_shared_dpll(struct drm_i915_private *dev_priv,
123+
struct intel_shared_dpll *pll,
124+
bool state);
125+
#define assert_shared_dpll_enabled(d, p) assert_shared_dpll(d, p, true)
126+
#define assert_shared_dpll_disabled(d, p) assert_shared_dpll(d, p, false)
127+
struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,
128+
struct intel_crtc_state *state);
129+
void intel_prepare_shared_dpll(struct intel_crtc *crtc);
130+
void intel_enable_shared_dpll(struct intel_crtc *crtc);
131+
void intel_disable_shared_dpll(struct intel_crtc *crtc);
132+
void intel_shared_dpll_commit(struct drm_atomic_state *state);
133+
void intel_shared_dpll_init(struct drm_device *dev);
134+
105135

106136
#endif /* _INTEL_DPLL_MGR_H_ */

drivers/gpu/drm/i915/intel_drv.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,34 +1203,6 @@ void intel_create_rotation_property(struct drm_device *dev,
12031203
void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,
12041204
enum pipe pipe);
12051205

1206-
/* shared dpll functions */
1207-
struct intel_shared_dpll *
1208-
intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,
1209-
enum intel_dpll_id id);
1210-
enum intel_dpll_id
1211-
intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,
1212-
struct intel_shared_dpll *pll);
1213-
void
1214-
intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,
1215-
struct intel_shared_dpll *pll,
1216-
struct intel_crtc *crtc);
1217-
void
1218-
intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,
1219-
struct intel_shared_dpll *pll,
1220-
struct intel_crtc *crtc);
1221-
void assert_shared_dpll(struct drm_i915_private *dev_priv,
1222-
struct intel_shared_dpll *pll,
1223-
bool state);
1224-
#define assert_shared_dpll_enabled(d, p) assert_shared_dpll(d, p, true)
1225-
#define assert_shared_dpll_disabled(d, p) assert_shared_dpll(d, p, false)
1226-
struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,
1227-
struct intel_crtc_state *state);
1228-
void intel_prepare_shared_dpll(struct intel_crtc *crtc);
1229-
void intel_enable_shared_dpll(struct intel_crtc *crtc);
1230-
void intel_disable_shared_dpll(struct intel_crtc *crtc);
1231-
void intel_shared_dpll_commit(struct drm_atomic_state *state);
1232-
void intel_shared_dpll_init(struct drm_device *dev);
1233-
12341206
int vlv_force_pll_on(struct drm_device *dev, enum pipe pipe,
12351207
const struct dpll *dpll);
12361208
void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe);

0 commit comments

Comments
 (0)