video: tegra: dsi: setup packet only when needed

Put a check to verify if ganged mode or split link has
been initialized before setting up DSI packet length

bug 1679057

Change-Id: Id79d0652f926390312cb181c8ff694390d98df3c
Signed-off-by: Naveen Kumar S <nkumars@nvidia.com>
Reviewed-on: http://git-master/r/790144
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Reviewed-by: Animesh Kishore <ankishore@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>

1 files changed, 34 insertions, 25 deletions

diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index 6b20833f1..16e76cb68 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -1488,33 +1488,42 @@ static void tegra_dsi_setup_ganged_split_link_mode_pkt_length(
                 DSI_PKT_LEN_0_1_LENGTH_1(0);
         tegra_dsi_writel(dsi, val, DSI_PKT_LEN_0_1);
 
-        switch (dsi->info.ganged_type) {
-        case TEGRA_DSI_GANGED_SYMMETRIC_LEFT_RIGHT: /* fall through */
-        case TEGRA_DSI_GANGED_SYMMETRIC_EVEN_ODD: /* fall through */
-                hact_pkt_len_pix = DIV_ROUND_UP(hact_pkt_len_pix_orig, 2);
-                pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 2);
-                break;
-        case TEGRA_DSI_GANGED_SYMMETRIC_LEFT_RIGHT_OVERLAP:
-                hact_pkt_len_pix = DIV_ROUND_UP(hact_pkt_len_pix_orig, 2) +
-                        dsi->info.ganged_overlap;
-                pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 2);
-                break;
-        default:
-                dev_err(&dc->ndev->dev, "dsi: invalid ganged type\n");
+        if (dsi->info.ganged_type) {
+                switch (dsi->info.ganged_type) {
+                case TEGRA_DSI_GANGED_SYMMETRIC_LEFT_RIGHT: /* fall through */
+                case TEGRA_DSI_GANGED_SYMMETRIC_EVEN_ODD: /* fall through */
+                        hact_pkt_len_pix =
+                                        DIV_ROUND_UP(hact_pkt_len_pix_orig, 2);
+                        pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 2);
+                        break;
+                case TEGRA_DSI_GANGED_SYMMETRIC_LEFT_RIGHT_OVERLAP:
+                        hact_pkt_len_pix =
+                                        DIV_ROUND_UP(hact_pkt_len_pix_orig, 2) +
+                                        dsi->info.ganged_overlap;
+                        pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 2);
+                        break;
+                default:
+                        dev_err(&dc->ndev->dev, "dsi: invalid ganged type\n");
+                }
         }
 
-        switch (dsi->info.split_link_type) {
-        case TEGRA_DSI_SPLIT_LINK_A_B: /* fall through */
-        case TEGRA_DSI_SPLIT_LINK_C_D:
-                hact_pkt_len_pix = DIV_ROUND_UP(hact_pkt_len_pix_orig, 2);
-                pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 2);
-                break;
-        case TEGRA_DSI_SPLIT_LINK_A_B_C_D:
-                hact_pkt_len_pix = DIV_ROUND_UP(hact_pkt_len_pix_orig, 4);
-                pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 4);
-                break;
-        default:
-                dev_err(&dc->ndev->dev, "dsi: invalid split link type\n");
+        if (dsi->info.split_link_type) {
+                switch (dsi->info.split_link_type) {
+                case TEGRA_DSI_SPLIT_LINK_A_B: /* fall through */
+                case TEGRA_DSI_SPLIT_LINK_C_D:
+                        hact_pkt_len_pix =
+                                        DIV_ROUND_UP(hact_pkt_len_pix_orig, 2);
+                        pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 2);
+                        break;
+                case TEGRA_DSI_SPLIT_LINK_A_B_C_D:
+                        hact_pkt_len_pix =
+                                        DIV_ROUND_UP(hact_pkt_len_pix_orig, 4);
+                        pix_per_line = DIV_ROUND_UP(pix_per_line_orig, 4);
+                        break;
+                default:
+                        dev_err(&dc->ndev->dev,
+                                        "dsi: invalid split link type\n");
+                }
         }
 
         for (i = 0; i < dsi->max_instances; i++) {