Skip to content

Commit 01e5262

Browse files
committed
drm/i915/dsi: split out vlv_dsi_pll.h
Follow the convention of corresponding .h for .c. Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Reviewed-by: Hans de Goede <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent aebdd74 commit 01e5262

File tree

6 files changed

+42
-24
lines changed

6 files changed

+42
-24
lines changed

drivers/gpu/drm/i915/display/intel_color.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "intel_de.h"
2727
#include "intel_display_types.h"
2828
#include "intel_dpll.h"
29-
#include "intel_dsi.h"
29+
#include "vlv_dsi_pll.h"
3030

3131
#define CTM_COEFF_SIGN (1ULL << 63)
3232

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
#include "i9xx_plane.h"
110110
#include "skl_scaler.h"
111111
#include "skl_universal_plane.h"
112+
#include "vlv_dsi_pll.h"
112113
#include "vlv_sideband.h"
113114

114115
static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state);

drivers/gpu/drm/i915/display/intel_dsi.h

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -187,27 +187,4 @@ struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
187187
enum port port);
188188
void vlv_dsi_init(struct drm_i915_private *dev_priv);
189189

190-
/* vlv_dsi_pll.c */
191-
int vlv_dsi_pll_compute(struct intel_encoder *encoder,
192-
struct intel_crtc_state *config);
193-
void vlv_dsi_pll_enable(struct intel_encoder *encoder,
194-
const struct intel_crtc_state *config);
195-
void vlv_dsi_pll_disable(struct intel_encoder *encoder);
196-
u32 vlv_dsi_get_pclk(struct intel_encoder *encoder,
197-
struct intel_crtc_state *config);
198-
void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port);
199-
200-
bool bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);
201-
int bxt_dsi_pll_compute(struct intel_encoder *encoder,
202-
struct intel_crtc_state *config);
203-
void bxt_dsi_pll_enable(struct intel_encoder *encoder,
204-
const struct intel_crtc_state *config);
205-
void bxt_dsi_pll_disable(struct intel_encoder *encoder);
206-
u32 bxt_dsi_get_pclk(struct intel_encoder *encoder,
207-
struct intel_crtc_state *config);
208-
void bxt_dsi_reset_clocks(struct intel_encoder *encoder, enum port port);
209-
210-
void assert_dsi_pll_enabled(struct drm_i915_private *i915);
211-
void assert_dsi_pll_disabled(struct drm_i915_private *i915);
212-
213190
#endif /* _INTEL_DSI_H */

drivers/gpu/drm/i915/display/vlv_dsi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "intel_fifo_underrun.h"
4343
#include "intel_panel.h"
4444
#include "skl_scaler.h"
45+
#include "vlv_dsi_pll.h"
4546
#include "vlv_sideband.h"
4647

4748
/* return pixels in terms of txbyteclkhs */

drivers/gpu/drm/i915/display/vlv_dsi_pll.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "intel_de.h"
3232
#include "intel_display_types.h"
3333
#include "intel_dsi.h"
34+
#include "vlv_dsi_pll.h"
3435
#include "vlv_sideband.h"
3536

3637
static const u16 lfsr_converts[] = {
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/* SPDX-License-Identifier: MIT */
2+
/*
3+
* Copyright © 2021 Intel Corporation
4+
*/
5+
6+
#ifndef __VLV_DSI_PLL_H__
7+
#define __VLV_DSI_PLL_H__
8+
9+
#include <linux/types.h>
10+
11+
enum port;
12+
struct drm_i915_private;
13+
struct intel_crtc_state;
14+
struct intel_encoder;
15+
16+
int vlv_dsi_pll_compute(struct intel_encoder *encoder,
17+
struct intel_crtc_state *config);
18+
void vlv_dsi_pll_enable(struct intel_encoder *encoder,
19+
const struct intel_crtc_state *config);
20+
void vlv_dsi_pll_disable(struct intel_encoder *encoder);
21+
u32 vlv_dsi_get_pclk(struct intel_encoder *encoder,
22+
struct intel_crtc_state *config);
23+
void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port);
24+
25+
bool bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);
26+
int bxt_dsi_pll_compute(struct intel_encoder *encoder,
27+
struct intel_crtc_state *config);
28+
void bxt_dsi_pll_enable(struct intel_encoder *encoder,
29+
const struct intel_crtc_state *config);
30+
void bxt_dsi_pll_disable(struct intel_encoder *encoder);
31+
u32 bxt_dsi_get_pclk(struct intel_encoder *encoder,
32+
struct intel_crtc_state *config);
33+
void bxt_dsi_reset_clocks(struct intel_encoder *encoder, enum port port);
34+
35+
void assert_dsi_pll_enabled(struct drm_i915_private *i915);
36+
void assert_dsi_pll_disabled(struct drm_i915_private *i915);
37+
38+
#endif /* __VLV_DSI_PLL_H__ */

0 commit comments

Comments
 (0)