video: tegra: dp: Remove early enable

Move edid read from panel to display
enable operation.

Bug 1472436

Change-Id: I8f44283620b110af2bf13dd6370da3dff0b14138
Signed-off-by: Animesh Kishore <ankishore@nvidia.com>
Reviewed-on: http://git-master/r/379874
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User

1 files changed, 39 insertions, 60 deletions

diff --git a/drivers/video/tegra/dc/dp.c b/drivers/video/tegra/dc/dp.c
index 800f091bf..a1fe98a89 100644
--- a/drivers/video/tegra/dc/dp.c
+++ b/drivers/video/tegra/dc/dp.c
@@ -1968,6 +1968,42 @@ static void tegra_dp_link_config(struct tegra_dc_dp_data *dp)
         tegra_sor_port_enable(sor, true);
 }
 
+static int tegra_dp_edid(struct tegra_dc_dp_data *dp)
+{
+        struct tegra_dc *dc = dp->dc;
+        struct fb_monspecs specs;
+        int err;
+
+        err = tegra_edid_get_monspecs(dp->dp_edid, &specs);
+        if (err < 0) {
+                dev_err(&dc->ndev->dev, "dp: Failed to get EDID data\n");
+                goto fail;
+        }
+
+        dc->out->h_size = specs.max_x * 10; /* in mm */
+        dc->out->v_size = specs.max_y * 10;
+
+        tegra_dc_set_fb_mode(dc, specs.modedb, false);
+
+        if (!dc->out->width && !dc->out->height) {
+                /*
+                 * EDID specifies either the acutal screen sizes or
+                 * the aspect ratios. The panel file can choose to
+                 * trust the value as the actual sizes by leaving
+                 * width/height to 0s
+                 */
+                dc->out->width = dc->out->h_size;
+                dc->out->height = dc->out->v_size;
+        }
+
+        /* adjust clk for new mode */
+        tegra_dc_setup_clk(dc, dc->clk);
+
+        return 0;
+fail:
+        return err;
+}
+
 static void tegra_dc_dp_enable(struct tegra_dc *dc)
 {
         struct tegra_dc_dp_data *dp = tegra_dc_get_outdata(dc);
@@ -1997,6 +2033,9 @@ static void tegra_dc_dp_enable(struct tegra_dc *dc)
                 goto error_enable;
         }
 
+        if (dp->dp_edid && !dp->dp_edid->data)
+                tegra_dp_edid(dp);
+
         tegra_dp_dpcd_init(dp);
 
         tegra_dc_sor_enable_dp(dp->sor);
@@ -2068,65 +2107,6 @@ static long tegra_dc_dp_setup_clk(struct tegra_dc *dc, struct clk *clk)
         return tegra_dc_pclk_round_rate(dc, dp->sor->dc->mode.pclk);
 }
 
-
-static bool tegra_dc_dp_early_enable(struct tegra_dc *dc)
-{
-        struct tegra_dc_dp_data *dp = tegra_dc_get_outdata(dc);
-        struct fb_monspecs specs;
-        u32    reg_val;
-
-        /* Power on panel */
-        if (dc->out->enable)
-                dc->out->enable(&dc->ndev->dev);
-
-        tegra_dc_get(dp->dc);
-
-        if (!tegra_is_clk_enabled(dp->clk))
-                clk_prepare_enable(dp->clk);
-        tegra_dpaux_enable(dp);
-        tegra_dp_enable_irq(dp->irq);
-        tegra_dp_hpd_config(dp);
-
-        tegra_dc_unpowergate_locked(dc);
-        msleep(80);
-
-        if (tegra_dp_hpd_plug(dp) < 0) {
-                dev_err(&dc->ndev->dev, "dp: hpd plug failed\n");
-                return false;
-        }
-
-        reg_val = tegra_dpaux_readl(dp, DPAUX_DP_AUXSTAT);
-        if (!(reg_val & DPAUX_DP_AUXSTAT_HPD_STATUS_PLUGGED)) {
-                dev_err(&dc->ndev->dev, "dp: Failed to detect HPD\n");
-                return false;
-        }
-
-        if (tegra_edid_get_monspecs(dp->dp_edid, &specs)) {
-                dev_err(&dc->ndev->dev, "dp: Failed to get EDID data\n");
-                return false;
-        }
-
-        tegra_dc_set_fb_mode(dc, specs.modedb, false);
-
-        dc->out->h_size = specs.max_x * 10; /* in mm */
-        dc->out->v_size = specs.max_y * 10;
-
-        if (!dc->out->width && !dc->out->height) {
-                /* EDID specifies either the acutal screen sizes or
-                   the aspect ratios. The panel file can choose to
-                   trust the value as the actual sizes by leaving
-                   width/height to 0s */
-                dc->out->width = dc->out->h_size;
-                dc->out->height = dc->out->v_size;
-        }
-
-        tegra_dc_powergate_locked(dc);
-        msleep(50);
-        tegra_dp_disable_irq(dp->irq);
-        tegra_dc_put(dp->dc);
-        return true;
-}
-
 static void tegra_dc_dp_modeset_notifier(struct tegra_dc *dc)
 {
         struct tegra_dc_dp_data *dp = tegra_dc_get_outdata(dc);
@@ -2140,7 +2120,6 @@ struct tegra_dc_out_ops tegra_dc_dp_ops = {
         .disable   = tegra_dc_dp_disable,
         .setup_clk = tegra_dc_dp_setup_clk,
         .modeset_notifier = tegra_dc_dp_modeset_notifier,
-        .early_enable     = tegra_dc_dp_early_enable,
 };