video: tegra: dc: Add missing OUT_NVSR_DP flags

Several pieces of code depend on OUT_DP being set.
OUT_NVSR_DP should also be set in these places.

Change-Id: Iee54050b6ce1f756a7ae4631005f6e23618f08df
Signed-off-by: Daniel Solomon <daniels@nvidia.com>
Reviewed-on: http://git-master/r/384174
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chao Xu <cxu@nvidia.com>

diff --git a/drivers/video/tegra/dc/bandwidth.c b/drivers/video/tegra/dc/bandwidth.c
index ba11b0a3e7f14f5e799ae0ceeba48bd6723d0d8f..a0ec859e660ee9324930bd690925f9fca789fa7a 100644 (file)
--- a/drivers/video/tegra/dc/bandwidth.c
+++ b/drivers/video/tegra/dc/bandwidth.c
@@ -872,7 +872,8 @@ 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) {
+               } else if ((dc->out->type == TEGRA_DC_OUT_DP) ||
+                       (dc->out->type == TEGRA_DC_OUT_NVSR_DP)) {
                        if (dc->mode.pclk)
                                pclk = KHZ2PICOS(dc->mode.pclk / 1000);
                        else

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 9e51d79db78264ce1f91ffcac8fcff0537a2210f..c2f9dd37bb7fb14b2a1296579a0cdca319376239 100644 (file)
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -2426,6 +2426,7 @@ static int _tegra_dc_set_default_videomode(struct tegra_dc *dc)
                break;
 
                case TEGRA_DC_OUT_DP:
+               case TEGRA_DC_OUT_NVSR_DP:
                        return tegra_dc_set_fb_mode(dc, &tegra_dc_vga_mode, 0);
 
                /* Do nothing for other outputs for now */

diff --git a/drivers/video/tegra/dc/mode.c b/drivers/video/tegra/dc/mode.c
index 7d788fbc12cdbea9f02859ad1562b4b43e95bc60..b38e51489b7a341d364e235eb77e37e206eb5503 100644 (file)
--- a/drivers/video/tegra/dc/mode.c
+++ b/drivers/video/tegra/dc/mode.c
@@ -276,6 +276,7 @@ int tegra_dc_program_mode(struct tegra_dc *dc, struct tegra_dc_mode *mode)
        tegra_dc_writel(dc, mode->h_sync_width | (v_sync_width << 16),
                        DC_DISP_SYNC_WIDTH);
        if ((dc->out->type == TEGRA_DC_OUT_DP) ||
+               (dc->out->type == TEGRA_DC_OUT_NVSR_DP) ||
                (dc->out->type == TEGRA_DC_OUT_LVDS)) {
                tegra_dc_writel(dc, mode->h_back_porch |
                        ((v_back_porch - mode->v_ref_to_sync) << 16),