aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-12-19 09:19:21 -0500
committerThierry Reding <treding@nvidia.com>2015-01-27 04:14:56 -0500
commit3f0fb52ef013e76159b35386f22924f99d8034a4 (patch)
treed6378cbe5c1dc692c39b781463801ce84fdccf3e
parent1503ca47d76e184eaeabe7cfa31de97b5ec36a04 (diff)
drm/tegra: Remove unused ->mode_fixup() callbacks
All output drivers have now been converted to use the ->atomic_check() callback, so the ->mode_fixup() callbacks are no longer used. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/dsi.c87
-rw-r--r--drivers/gpu/drm/tegra/hdmi.c27
-rw-r--r--drivers/gpu/drm/tegra/rgb.c38
-rw-r--r--drivers/gpu/drm/tegra/sor.c27
4 files changed, 0 insertions, 179 deletions
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index 00b307120cdd..6875885a2dca 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -786,92 +786,6 @@ static void tegra_dsi_encoder_dpms(struct drm_encoder *encoder, int mode)
786{ 786{
787} 787}
788 788
789static bool tegra_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
790 const struct drm_display_mode *mode,
791 struct drm_display_mode *adjusted)
792{
793 struct tegra_output *output = encoder_to_output(encoder);
794 struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
795 unsigned int mul, div, scdiv, vrefresh, lanes;
796 struct tegra_dsi *dsi = to_dsi(output);
797 struct mipi_dphy_timing timing;
798 unsigned long pclk, bclk, plld;
799 unsigned long period;
800 int err;
801
802 lanes = tegra_dsi_get_lanes(dsi);
803 pclk = mode->clock * 1000;
804
805 err = tegra_dsi_get_muldiv(dsi->format, &mul, &div);
806 if (err < 0)
807 return err;
808
809 DRM_DEBUG_KMS("mul: %u, div: %u, lanes: %u\n", mul, div, lanes);
810 vrefresh = drm_mode_vrefresh(mode);
811 DRM_DEBUG_KMS("vrefresh: %u\n", vrefresh);
812
813 /* compute byte clock */
814 bclk = (pclk * mul) / (div * lanes);
815
816 /*
817 * Compute bit clock and round up to the next MHz.
818 */
819 plld = DIV_ROUND_UP(bclk * 8, USEC_PER_SEC) * USEC_PER_SEC;
820 period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, plld);
821
822 /*
823 * We divide the frequency by two here, but we make up for that by
824 * setting the shift clock divider (further below) to half of the
825 * correct value.
826 */
827 plld /= 2;
828
829 /*
830 * Derive pixel clock from bit clock using the shift clock divider.
831 * Note that this is only half of what we would expect, but we need
832 * that to make up for the fact that we divided the bit clock by a
833 * factor of two above.
834 *
835 * It's not clear exactly why this is necessary, but the display is
836 * not working properly otherwise. Perhaps the PLLs cannot generate
837 * frequencies sufficiently high.
838 */
839 scdiv = ((8 * mul) / (div * lanes)) - 2;
840
841 err = tegra_dc_setup_clock(dc, dsi->clk_parent, plld, scdiv);
842 if (err < 0) {
843 dev_err(output->dev, "failed to setup DC clock: %d\n", err);
844 return false;
845 }
846
847 err = clk_set_rate(dsi->clk_parent, plld);
848 if (err < 0) {
849 dev_err(dsi->dev, "failed to set clock rate to %lu Hz\n",
850 plld);
851 return false;
852 }
853
854 tegra_dsi_set_timeout(dsi, bclk, vrefresh);
855
856 err = mipi_dphy_timing_get_default(&timing, period);
857 if (err < 0)
858 return err;
859
860 err = mipi_dphy_timing_validate(&timing, period);
861 if (err < 0) {
862 dev_err(dsi->dev, "failed to validate D-PHY timing: %d\n", err);
863 return err;
864 }
865
866 /*
867 * The D-PHY timing fields are expressed in byte-clock cycles, so
868 * multiply the period by 8.
869 */
870 tegra_dsi_set_phy_timing(dsi, period * 8, &timing);
871
872 return true;
873}
874
875static void tegra_dsi_encoder_prepare(struct drm_encoder *encoder) 789static void tegra_dsi_encoder_prepare(struct drm_encoder *encoder)
876{ 790{
877} 791}
@@ -1053,7 +967,6 @@ tegra_dsi_encoder_atomic_check(struct drm_encoder *encoder,
1053 967
1054static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = { 968static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = {
1055 .dpms = tegra_dsi_encoder_dpms, 969 .dpms = tegra_dsi_encoder_dpms,
1056 .mode_fixup = tegra_dsi_encoder_mode_fixup,
1057 .prepare = tegra_dsi_encoder_prepare, 970 .prepare = tegra_dsi_encoder_prepare,
1058 .commit = tegra_dsi_encoder_commit, 971 .commit = tegra_dsi_encoder_commit,
1059 .mode_set = tegra_dsi_encoder_mode_set, 972 .mode_set = tegra_dsi_encoder_mode_set,
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index abb1ea0385ec..07771956cc94 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -822,32 +822,6 @@ static void tegra_hdmi_encoder_dpms(struct drm_encoder *encoder, int mode)
822{ 822{
823} 823}
824 824
825static bool tegra_hdmi_encoder_mode_fixup(struct drm_encoder *encoder,
826 const struct drm_display_mode *mode,
827 struct drm_display_mode *adjusted)
828{
829 struct tegra_output *output = encoder_to_output(encoder);
830 struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
831 struct tegra_hdmi *hdmi = to_hdmi(output);
832 unsigned long pclk = mode->clock * 1000;
833 int err;
834
835 err = tegra_dc_setup_clock(dc, hdmi->clk_parent, pclk, 0);
836 if (err < 0) {
837 dev_err(output->dev, "failed to setup DC clock: %d\n", err);
838 return false;
839 }
840
841 err = clk_set_rate(hdmi->clk_parent, pclk);
842 if (err < 0) {
843 dev_err(output->dev, "failed to set clock rate to %lu Hz\n",
844 pclk);
845 return false;
846 }
847
848 return true;
849}
850
851static void tegra_hdmi_encoder_prepare(struct drm_encoder *encoder) 825static void tegra_hdmi_encoder_prepare(struct drm_encoder *encoder)
852{ 826{
853} 827}
@@ -1104,7 +1078,6 @@ tegra_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
1104 1078
1105static const struct drm_encoder_helper_funcs tegra_hdmi_encoder_helper_funcs = { 1079static const struct drm_encoder_helper_funcs tegra_hdmi_encoder_helper_funcs = {
1106 .dpms = tegra_hdmi_encoder_dpms, 1080 .dpms = tegra_hdmi_encoder_dpms,
1107 .mode_fixup = tegra_hdmi_encoder_mode_fixup,
1108 .prepare = tegra_hdmi_encoder_prepare, 1081 .prepare = tegra_hdmi_encoder_prepare,
1109 .commit = tegra_hdmi_encoder_commit, 1082 .commit = tegra_hdmi_encoder_commit,
1110 .mode_set = tegra_hdmi_encoder_mode_set, 1083 .mode_set = tegra_hdmi_encoder_mode_set,
diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index be1b38936dbe..0c8b458b2364 100644
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -129,43 +129,6 @@ static void tegra_rgb_encoder_dpms(struct drm_encoder *encoder, int mode)
129{ 129{
130} 130}
131 131
132static bool tegra_rgb_encoder_mode_fixup(struct drm_encoder *encoder,
133 const struct drm_display_mode *mode,
134 struct drm_display_mode *adjusted)
135{
136 struct tegra_output *output = encoder_to_output(encoder);
137 unsigned long pclk = mode->clock * 1000;
138 struct tegra_rgb *rgb = to_rgb(output);
139 unsigned int div;
140 int err;
141
142 /*
143 * We may not want to change the frequency of the parent clock, since
144 * it may be a parent for other peripherals. This is due to the fact
145 * that on Tegra20 there's only a single clock dedicated to display
146 * (pll_d_out0), whereas later generations have a second one that can
147 * be used to independently drive a second output (pll_d2_out0).
148 *
149 * As a way to support multiple outputs on Tegra20 as well, pll_p is
150 * typically used as the parent clock for the display controllers.
151 * But this comes at a cost: pll_p is the parent of several other
152 * peripherals, so its frequency shouldn't change out of the blue.
153 *
154 * The best we can do at this point is to use the shift clock divider
155 * and hope that the desired frequency can be matched (or at least
156 * matched sufficiently close that the panel will still work).
157 */
158 div = ((clk_get_rate(rgb->clk) * 2) / pclk) - 2;
159
160 err = tegra_dc_setup_clock(rgb->dc, rgb->clk_parent, pclk, div);
161 if (err < 0) {
162 dev_err(output->dev, "failed to setup DC clock: %d\n", err);
163 return false;
164 }
165
166 return true;
167}
168
169static void tegra_rgb_encoder_prepare(struct drm_encoder *encoder) 132static void tegra_rgb_encoder_prepare(struct drm_encoder *encoder)
170{ 133{
171} 134}
@@ -278,7 +241,6 @@ tegra_rgb_encoder_atomic_check(struct drm_encoder *encoder,
278 241
279static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = { 242static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = {
280 .dpms = tegra_rgb_encoder_dpms, 243 .dpms = tegra_rgb_encoder_dpms,
281 .mode_fixup = tegra_rgb_encoder_mode_fixup,
282 .prepare = tegra_rgb_encoder_prepare, 244 .prepare = tegra_rgb_encoder_prepare,
283 .commit = tegra_rgb_encoder_commit, 245 .commit = tegra_rgb_encoder_commit,
284 .mode_set = tegra_rgb_encoder_mode_set, 246 .mode_set = tegra_rgb_encoder_mode_set,
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 7463ea02a083..e813df71e30c 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -781,32 +781,6 @@ static void tegra_sor_encoder_dpms(struct drm_encoder *encoder, int mode)
781{ 781{
782} 782}
783 783
784static bool tegra_sor_encoder_mode_fixup(struct drm_encoder *encoder,
785 const struct drm_display_mode *mode,
786 struct drm_display_mode *adjusted)
787{
788 struct tegra_output *output = encoder_to_output(encoder);
789 struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
790 unsigned long pclk = mode->clock * 1000;
791 struct tegra_sor *sor = to_sor(output);
792 int err;
793
794 err = tegra_dc_setup_clock(dc, sor->clk_parent, pclk, 0);
795 if (err < 0) {
796 dev_err(output->dev, "failed to setup DC clock: %d\n", err);
797 return false;
798 }
799
800 err = clk_set_rate(sor->clk_parent, pclk);
801 if (err < 0) {
802 dev_err(output->dev, "failed to set clock rate to %lu Hz\n",
803 pclk);
804 return false;
805 }
806
807 return true;
808}
809
810static void tegra_sor_encoder_prepare(struct drm_encoder *encoder) 784static void tegra_sor_encoder_prepare(struct drm_encoder *encoder)
811{ 785{
812} 786}
@@ -1343,7 +1317,6 @@ tegra_sor_encoder_atomic_check(struct drm_encoder *encoder,
1343 1317
1344static const struct drm_encoder_helper_funcs tegra_sor_encoder_helper_funcs = { 1318static const struct drm_encoder_helper_funcs tegra_sor_encoder_helper_funcs = {
1345 .dpms = tegra_sor_encoder_dpms, 1319 .dpms = tegra_sor_encoder_dpms,
1346 .mode_fixup = tegra_sor_encoder_mode_fixup,
1347 .prepare = tegra_sor_encoder_prepare, 1320 .prepare = tegra_sor_encoder_prepare,
1348 .commit = tegra_sor_encoder_commit, 1321 .commit = tegra_sor_encoder_commit,
1349 .mode_set = tegra_sor_encoder_mode_set, 1322 .mode_set = tegra_sor_encoder_mode_set,