aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/tegra/dc.c20
-rw-r--r--drivers/gpu/drm/tegra/drm.h2
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index d12c701ed292..e892f8c64bc7 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -1164,26 +1164,6 @@ static int tegra_dc_set_timings(struct tegra_dc *dc,
1164 return 0; 1164 return 0;
1165} 1165}
1166 1166
1167int tegra_dc_setup_clock(struct tegra_dc *dc, struct clk *parent,
1168 unsigned long pclk, unsigned int div)
1169{
1170 u32 value;
1171 int err;
1172
1173 err = clk_set_parent(dc->clk, parent);
1174 if (err < 0) {
1175 dev_err(dc->dev, "failed to set parent clock: %d\n", err);
1176 return err;
1177 }
1178
1179 DRM_DEBUG_KMS("rate: %lu, div: %u\n", clk_get_rate(dc->clk), div);
1180
1181 value = SHIFT_CLK_DIVIDER(div) | PIXEL_CLK_DIVIDER_PCD1;
1182 tegra_dc_writel(dc, value, DC_DISP_DISP_CLOCK_CONTROL);
1183
1184 return 0;
1185}
1186
1187int tegra_dc_state_setup_clock(struct tegra_dc *dc, 1167int tegra_dc_state_setup_clock(struct tegra_dc *dc,
1188 struct drm_crtc_state *crtc_state, 1168 struct drm_crtc_state *crtc_state,
1189 struct clk *clk, unsigned long pclk, 1169 struct clk *clk, unsigned long pclk,
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index ded04e3473e9..659b2fcc986d 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -186,8 +186,6 @@ void tegra_dc_enable_vblank(struct tegra_dc *dc);
186void tegra_dc_disable_vblank(struct tegra_dc *dc); 186void tegra_dc_disable_vblank(struct tegra_dc *dc);
187void tegra_dc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file); 187void tegra_dc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file);
188void tegra_dc_commit(struct tegra_dc *dc); 188void tegra_dc_commit(struct tegra_dc *dc);
189int tegra_dc_setup_clock(struct tegra_dc *dc, struct clk *parent,
190 unsigned long pclk, unsigned int div);
191int tegra_dc_state_setup_clock(struct tegra_dc *dc, 189int tegra_dc_state_setup_clock(struct tegra_dc *dc,
192 struct drm_crtc_state *crtc_state, 190 struct drm_crtc_state *crtc_state,
193 struct clk *clk, unsigned long pclk, 191 struct clk *clk, unsigned long pclk,