8 files changed, 117 insertions, 147 deletions

diff --git a/drivers/video/tegra/dc/bandwidth.c b/drivers/video/tegra/dc/bandwidth.c
index b692304e3..bcaaa4a1a 100644
--- a/drivers/video/tegra/dc/bandwidth.c
+++ b/drivers/video/tegra/dc/bandwidth.c
@@ -745,6 +745,9 @@ void tegra_dc_program_bandwidth(struct tegra_dc *dc, bool use_new)
 #ifdef CONFIG_TEGRA_ISOMGR
                 int latency;
 
+                if (!dc->isomgr_handle)
+                        return;
+
                 /* reserve atleast the minimum bandwidth. */
                 bw = max(bw, tegra_dc_calc_min_bandwidth(dc));
                 latency = tegra_isomgr_reserve(dc->isomgr_handle, bw, 1000);
@@ -850,6 +853,11 @@ long tegra_dc_calc_min_bandwidth(struct tegra_dc *dc)
 #else
                         pclk = KHZ2PICOS(150000); /* 150MHz max */
 #endif
+                } else if (dc->out->type == TEGRA_DC_OUT_DP) {
+                        if (dc->mode.pclk)
+                                pclk = KHZ2PICOS(dc->mode.pclk / 1000);
+                        else
+                                pclk = KHZ2PICOS(25200); /* vga */
                 } else {
                         pclk = KHZ2PICOS(dc->mode.pclk / 1000);
                 }
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index c716b1e9b..4f15f34b4 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -72,7 +72,7 @@
 #define DC_COM_PIN_OUTPUT_POLARITY1_INIT_VAL    0x01000000
 #define DC_COM_PIN_OUTPUT_POLARITY3_INIT_VAL    0x0
 
-static struct fb_videomode tegra_dc_hdmi_fallback_mode = {
+static struct fb_videomode tegra_dc_vga_mode = {
         .refresh = 60,
         .xres = 640,
         .yres = 480,
@@ -1419,22 +1419,6 @@ static int tegra_dc_set_out(struct tegra_dc *dc, struct tegra_dc_out *out)
                         return err;
                 }
         }
-        /* If there is no predefined mode, try early_enable()
-           to check mode from panel directly */
-        if (!mode && !out->n_modes && dc->out_ops &&
-                dc->out_ops->early_enable) {
-                if (dc->out_ops->early_enable(dc))
-                        dev_info(&dc->ndev->dev,
-                                "Detected mode: %dx%d (on %dx%dmm) pclk=%d\n",
-                                dc->mode.h_active, dc->mode.v_active,
-                                dc->out->h_size, dc->out->v_size,
-                                dc->mode.pclk);
-                else {
-                        dev_err(&dc->ndev->dev,
-                                "Error: failed to check panel mode\n");
-                        err = -EINVAL;
-                }
-        }
 
         return err;
 }
@@ -2355,13 +2339,15 @@ static int _tegra_dc_set_default_videomode(struct tegra_dc *dc)
                 /* DC enable called but no videomode is loaded.
                      Check if HDMI is connected, then set fallback mdoe */
                 if (tegra_dc_hpd(dc)) {
-                        return tegra_dc_set_fb_mode(dc,
-                                        &tegra_dc_hdmi_fallback_mode, 0);
+                        return tegra_dc_set_fb_mode(dc, &tegra_dc_vga_mode, 0);
                 } else
                         return false;
 
                 break;
 
+                case TEGRA_DC_OUT_DP:
+                        return tegra_dc_set_fb_mode(dc, &tegra_dc_vga_mode, 0);
+
                 /* Do nothing for other outputs for now */
                 case TEGRA_DC_OUT_RGB:
 
@@ -2925,39 +2911,18 @@ static int tegra_dc_probe(struct platform_device *ndev)
         }
         dc->mode_dirty = false; /* ignore changes tegra_dc_set_out has done */
 
-#ifdef CONFIG_TEGRA_ISOMGR
-        if (isomgr_client_id == -1) {
-                dc->isomgr_handle = NULL;
-        } else {
-                dc->isomgr_handle = tegra_isomgr_register(isomgr_client_id,
-                        tegra_dc_calc_min_bandwidth(dc),
-                        tegra_dc_bandwidth_renegotiate, dc);
-                if (IS_ERR(dc->isomgr_handle)) {
-                        dev_err(&dc->ndev->dev,
-                                "could not register isomgr. err=%ld\n",
-                                PTR_ERR(dc->isomgr_handle));
+#ifndef CONFIG_TEGRA_ISOMGR
+                /*
+                 * The emc is a shared clock, it will be set based on
+                 * the requirements for each user on the bus.
+                 */
+                emc_clk = clk_get(&ndev->dev, "emc");
+                if (IS_ERR_OR_NULL(emc_clk)) {
+                        dev_err(&ndev->dev, "can't get emc clock\n");
                         ret = -ENOENT;
                         goto err_put_clk;
                 }
-                dc->reserved_bw = tegra_dc_calc_min_bandwidth(dc);
-                /*
-                 * Use maximum value so we can try to reserve as much as
-                 * needed until we are told by isomgr to backoff.
-                 */
-                dc->available_bw = UINT_MAX;
-        }
-#else
-        /*
-         * The emc is a shared clock, it will be set based on
-         * the requirements for each user on the bus.
-         */
-        emc_clk = clk_get(&ndev->dev, "emc");
-        if (IS_ERR_OR_NULL(emc_clk)) {
-                dev_err(&ndev->dev, "can't get emc clock\n");
-                ret = -ENOENT;
-                goto err_put_clk;
-        }
-        dc->emc_clk = emc_clk;
+                dc->emc_clk = emc_clk;
 #endif
 
         dc->ext = tegra_dc_ext_register(ndev, dc);
@@ -2985,6 +2950,29 @@ static int tegra_dc_probe(struct platform_device *ndev)
                 dc->enabled = _tegra_dc_enable(dc);
         }
 
+#ifdef CONFIG_TEGRA_ISOMGR
+        if (isomgr_client_id == -1) {
+                dc->isomgr_handle = NULL;
+        } else {
+                dc->isomgr_handle = tegra_isomgr_register(isomgr_client_id,
+                        tegra_dc_calc_min_bandwidth(dc),
+                        tegra_dc_bandwidth_renegotiate, dc);
+                if (IS_ERR(dc->isomgr_handle)) {
+                        dev_err(&dc->ndev->dev,
+                                "could not register isomgr. err=%ld\n",
+                                PTR_ERR(dc->isomgr_handle));
+                        ret = -ENOENT;
+                        goto err_put_clk;
+                }
+                dc->reserved_bw = tegra_dc_calc_min_bandwidth(dc);
+                /*
+                 * Use maximum value so we can try to reserve as much as
+                 * needed until we are told by isomgr to backoff.
+                 */
+                dc->available_bw = UINT_MAX;
+        }
+#endif
+
         tegra_dc_create_debugfs(dc);
 
         dev_info(&ndev->dev, "probed\n");
diff --git a/drivers/video/tegra/dc/dc_priv_defs.h b/drivers/video/tegra/dc/dc_priv_defs.h
index 794e70280..6856f48dd 100644
--- a/drivers/video/tegra/dc/dc_priv_defs.h
+++ b/drivers/video/tegra/dc/dc_priv_defs.h
@@ -109,10 +109,6 @@ struct tegra_dc_out_ops {
         /* callback after new mode is programmed.
          * dc clocks are on at this point */
         void (*modeset_notifier)(struct tegra_dc *dc);
-        /* enable output before dc is fully enabled in order to get
-         * info such as panel mode for dc enablement.
-         */
-        bool (*early_enable)(struct tegra_dc *dc);
 };
 
 struct tegra_dc_shift_clk_div {
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,
 };
 
 
diff --git a/drivers/video/tegra/dc/edid.c b/drivers/video/tegra/dc/edid.c
index ad9fba3fa..47fa337e9 100644
--- a/drivers/video/tegra/dc/edid.c
+++ b/drivers/video/tegra/dc/edid.c
@@ -40,18 +40,6 @@ struct tegra_edid_pvt {
         struct tegra_dc_edid            dc_edid;
 };
 
-struct tegra_dc_i2c_ops {
-        i2c_transfer_func_t i2c_transfer;
-};
-
-struct tegra_edid {
-        struct tegra_edid_pvt   *data;
-
-        struct mutex            lock;
-        struct tegra_dc_i2c_ops i2c_ops;
-        struct tegra_dc         *dc;
-};
-
 #if defined(DEBUG) || defined(CONFIG_DEBUG_FS)
 static int tegra_edid_show(struct seq_file *s, void *unused)
 {
diff --git a/drivers/video/tegra/dc/edid.h b/drivers/video/tegra/dc/edid.h
index 60d32a39d..8a6f8c7ba 100644
--- a/drivers/video/tegra/dc/edid.h
+++ b/drivers/video/tegra/dc/edid.h
@@ -26,7 +26,23 @@
 
 #define ELD_MAX_MNL     16
 #define ELD_MAX_SAD     16
-struct tegra_edid;
+
+struct tegra_edid_pvt;
+
+typedef int (*i2c_transfer_func_t)(struct tegra_dc *dc, struct i2c_msg *msgs,
+        int num);
+
+struct tegra_dc_i2c_ops {
+        i2c_transfer_func_t i2c_transfer;
+};
+
+struct tegra_edid {
+        struct tegra_edid_pvt   *data;
+
+        struct mutex            lock;
+        struct tegra_dc_i2c_ops i2c_ops;
+        struct tegra_dc         *dc;
+};
 
 /*
  * ELD: EDID Like Data
@@ -49,9 +65,6 @@ struct tegra_edid_hdmi_eld {
         u8      sad[ELD_MAX_SAD];
 };
 
-typedef int (*i2c_transfer_func_t)(struct tegra_dc *dc, struct i2c_msg *msgs,
-        int num);
-
 struct tegra_edid *tegra_edid_create(struct tegra_dc *dc,
         i2c_transfer_func_t func);
 void tegra_edid_destroy(struct tegra_edid *edid);
diff --git a/drivers/video/tegra/dc/mode.c b/drivers/video/tegra/dc/mode.c
index feb71c84f..22c4fb6cf 100644
--- a/drivers/video/tegra/dc/mode.c
+++ b/drivers/video/tegra/dc/mode.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2010 Google, Inc.
  *
- * Copyright (c) 2010-2013, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2010-2014, NVIDIA CORPORATION, All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -219,6 +219,8 @@ int tegra_dc_program_mode(struct tegra_dc *dc, struct tegra_dc_mode *mode)
 
         print_mode(dc, mode, __func__);
 
+        tegra_dc_get(dc);
+
         /* use default EMC rate when switching modes */
 #ifdef CONFIG_TEGRA_ISOMGR
         dc->new_bw_kbps = tegra_dc_calc_min_bandwidth(dc);
@@ -351,6 +353,8 @@ int tegra_dc_program_mode(struct tegra_dc *dc, struct tegra_dc_mode *mode)
         if (dc->out_ops && dc->out_ops->modeset_notifier)
                 dc->out_ops->modeset_notifier(dc);
 
+        tegra_dc_put(dc);
+
         dc->mode_dirty = false;
 
         trace_display_mode(dc, &dc->mode);
@@ -365,9 +369,9 @@ int tegra_dc_get_panel_sync_rate(void)
 }
 EXPORT_SYMBOL(tegra_dc_get_panel_sync_rate);
 
-int tegra_dc_set_mode(struct tegra_dc *dc, const struct tegra_dc_mode *mode)
+static int _tegra_dc_set_mode(struct tegra_dc *dc,
+                                const struct tegra_dc_mode *mode)
 {
-        mutex_lock(&dc->lock);
         memcpy(&dc->mode, mode, sizeof(dc->mode));
         dc->mode_dirty = true;
 
@@ -378,6 +382,14 @@ int tegra_dc_set_mode(struct tegra_dc *dc, const struct tegra_dc_mode *mode)
 
         print_mode(dc, mode, __func__);
         dc->frametime_ns = calc_frametime_ns(mode);
+
+        return 0;
+}
+
+int tegra_dc_set_mode(struct tegra_dc *dc, const struct tegra_dc_mode *mode)
+{
+        mutex_lock(&dc->lock);
+        _tegra_dc_set_mode(dc, mode);
         mutex_unlock(&dc->lock);
 
         return 0;
@@ -520,6 +532,6 @@ int tegra_dc_set_fb_mode(struct tegra_dc *dc,
         if (!(fbmode->sync & FB_SYNC_VERT_HIGH_ACT))
                 mode.flags |= TEGRA_DC_MODE_FLAG_NEG_V_SYNC;
 
-        return tegra_dc_set_mode(dc, &mode);
+        return _tegra_dc_set_mode(dc, &mode);
 }
 EXPORT_SYMBOL(tegra_dc_set_fb_mode);
diff --git a/drivers/video/tegra/dc/nvsr.c b/drivers/video/tegra/dc/nvsr.c
index 7ad404b08..725b20eb1 100644
--- a/drivers/video/tegra/dc/nvsr.c
+++ b/drivers/video/tegra/dc/nvsr.c
@@ -845,15 +845,6 @@ static void tegra_dc_nvsr_enable(struct tegra_dc *dc)
         tegra_dc_nvsr_init_src(nvsr);
 }
 
-static bool tegra_dc_nvsr_early_enable(struct tegra_dc *dc)
-{
-        struct tegra_dc_nvsr_data *nvsr = dc->nvsr;
-        if (nvsr->out_ops.early_enable)
-                return nvsr->out_ops.early_enable(dc);
-
-        return true;
-}
-
 static void tegra_dc_nvsr_disable(struct tegra_dc *dc)
 {
         struct tegra_dc_nvsr_data *nvsr = dc->nvsr;
@@ -939,11 +930,6 @@ static void tegra_dc_nvsr_init_out_ops(struct tegra_dc_nvsr_data *nvsr,
                 nvsr->out_ops.enable = out_ops->enable;
         }
 
-        if (out_ops->early_enable) {
-                tegra_dc_nvsr_ops.early_enable = tegra_dc_nvsr_early_enable;
-                nvsr->out_ops.early_enable = out_ops->early_enable;
-        }
-
         if (out_ops->disable) {
                 tegra_dc_nvsr_ops.disable = tegra_dc_nvsr_disable;
                 nvsr->out_ops.disable = out_ops->disable;