diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-12-02 15:12:28 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-01-27 10:14:46 +0100 |
| commit | d5bae6f33ee98cf4c6939c4b8db2fc76c1eed720 (patch) | |
| tree | 4e978d540c6b4af8501f9f03f79c1c0909aaa271 /drivers/gpu/drm/tegra | |
| parent | 132085d84fca65c46b56dc0f8233910906a15e8d (diff) | |
drm/tegra: output: Make ->setup_clock() optional
In order to transition output drivers to using the struct tegra_output
as a helper rather than midlayer, make this callback optional. Instead
drivers should implement the equivalent as part of ->mode_fixup(). For
the conversion to atomic modesetting a new callback ->atomic_check()
should be implemented that updates the display controller's state with
the corresponding parent clock, rate and shift clock divider.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra')
| -rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/drm.h | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index d51173056a9e..e35e10758556 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1067,10 +1067,18 @@ static int tegra_crtc_setup_clk(struct drm_crtc *crtc, return -ENODEV; /* + * The ->setup_clock() callback is optional, but if encoders don't + * implement it they most likely need to do the equivalent within the + * ->mode_fixup() callback. + */ + if (!output->ops || !output->ops->setup_clock) + return 0; + + /* * This assumes that the parent clock is pll_d_out0 or pll_d2_out * respectively, each of which divides the base pll_d by 2. */ - err = tegra_output_setup_clock(output, dc->clk, pclk, &div); + err = output->ops->setup_clock(output, dc->clk, pclk, &div); if (err < 0) { dev_err(dc->dev, "failed to setup clock: %ld\n", err); return err; diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index bf749ac4a344..d7433976a40b 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -240,16 +240,6 @@ static inline int tegra_output_disable(struct tegra_output *output) return output ? -ENOSYS : -EINVAL; } -static inline int tegra_output_setup_clock(struct tegra_output *output, - struct clk *clk, unsigned long pclk, - unsigned int *div) -{ - if (output && output->ops && output->ops->setup_clock) - return output->ops->setup_clock(output, clk, pclk, div); - - return output ? -ENOSYS : -EINVAL; -} - static inline int tegra_output_check_mode(struct tegra_output *output, struct drm_display_mode *mode, enum drm_mode_status *status) |