dc: linsim removal

Removed tegra_platform_is_linsim if statements and
related #define because of linsim deprecation.

Bug 1903831

Change-Id: Iad07394e8f1459ab524c2098d25c52fc710221b6
Signed-off-by: William Pierce <wpierce@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1523449
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

8 files changed, 27 insertions, 54 deletions

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 7718b144e..25ab63fad 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -2816,7 +2816,7 @@ unsigned long tegra_dc_poll_register(struct tegra_dc *dc, u32 reg, u32 mask,
         unsigned long timeout_jf = jiffies + msecs_to_jiffies(timeout_ms);
         u32 reg_val = 0;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return 0;
 
         do {
@@ -3799,7 +3799,7 @@ bool tegra_dc_windows_are_dirty(struct tegra_dc *dc, u32 win_act_req_mask)
 {
         u32 val;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return false;
 
         val = tegra_dc_readl(dc, DC_CMD_STATE_CONTROL);
@@ -5502,11 +5502,8 @@ void tegra_dc_blank_wins(struct tegra_dc *dc, unsigned windows)
                 dcwins[nr_win++]->flags &= ~TEGRA_WIN_FLAG_ENABLED;
         }
 
-        /* Skip update for linsim */
-        if (!tegra_platform_is_linsim()) {
-                tegra_dc_update_windows(dcwins, nr_win, NULL, true, false);
-                tegra_dc_sync_windows(dcwins, nr_win);
-        }
+        tegra_dc_update_windows(dcwins, nr_win, NULL, true, false);
+        tegra_dc_sync_windows(dcwins, nr_win);
 
         tegra_dc_program_bandwidth(dc, true);
 
@@ -5866,13 +5863,6 @@ static int tegra_dc_probe(struct platform_device *ndev)
         struct resource of_fb_res;
         int hotplug_init_status = -1;
 
-#ifdef CONFIG_ARCH_TEGRA_210_SOC
-        if (tegra_platform_is_linsim()) {
-                dev_info(&ndev->dev, "DC instances are not present on linsim\n");
-                return -ENODEV;
-        }
-#endif
-
         /* Specify parameters for the maximum physical segment size. */
         ndev->dev.dma_parms = &tegra_dc_dma_parameters;
 
@@ -6245,7 +6235,7 @@ static int tegra_dc_probe(struct platform_device *ndev)
 
         if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) {
                 /* WAR: BL is putting DC in bad state for EDP configuration */
-                if (!(tegra_platform_is_linsim() || tegra_platform_is_vdk()) &&
+                if (!tegra_platform_is_vdk() &&
                         (dc->out->type == TEGRA_DC_OUT_DP ||
                                 dc->out->type == TEGRA_DC_OUT_NVSR_DP)) {
                         tegra_disp_clk_prepare_enable(dc->clk);
diff --git a/drivers/video/tegra/dc/dp.c b/drivers/video/tegra/dc/dp.c
index 83322de3d..94bf74c83 100644
--- a/drivers/video/tegra/dc/dp.c
+++ b/drivers/video/tegra/dc/dp.c
@@ -105,7 +105,6 @@ static inline void tegra_dp_disable_irq(u32 irq)
 
 #define is_hotplug_supported(dp) \
 ({ \
-        !tegra_platform_is_linsim() && \
         tegra_dc_is_ext_dp_panel(dp->dc); \
 })
 
@@ -133,7 +132,7 @@ tegra_dc_dpaux_poll_register(struct tegra_dc_dp_data *dp,
         unsigned long   timeout_jf = jiffies + msecs_to_jiffies(timeout_ms);
         u32             reg_val    = 0;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return 0;
 
         do {
@@ -2611,7 +2610,7 @@ static void tegra_dp_hpd_op_edid_recheck(void *drv_data)
 
 static inline void tegra_dp_reset(struct tegra_dc_dp_data *dp)
 {
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return;
 
         if (!dp || !dp->dpaux)
@@ -3162,9 +3161,7 @@ static bool tegra_dc_dp_hpd_state(struct tegra_dc *dc)
         if (WARN_ON(!dc || !dc->out))
                 return false;
 
-        if (dc->out->type == TEGRA_DC_OUT_FAKE_DP ||
-                tegra_platform_is_linsim() ||
-                tegra_platform_is_vdk())
+        if (dc->out->type == TEGRA_DC_OUT_FAKE_DP || tegra_platform_is_vdk())
                 return true;
 
         tegra_dpaux_clk_en(dpaux);
@@ -3251,7 +3248,7 @@ static void tegra_dc_dp_modeset_notifier(struct tegra_dc *dc)
         tegra_dc_sor_modeset_notifier(dp->sor, false);
         /* Pixel clock may be changed in new mode,
          * recalculate link config */
-        if (!(tegra_platform_is_linsim() || tegra_platform_is_vdk()))
+        if (!(tegra_platform_is_vdk()))
                 tegra_dc_dp_calc_config(dp, dp->mode, &dp->link_cfg);
 
 
diff --git a/drivers/video/tegra/dc/dsi_padctrl.c b/drivers/video/tegra/dc/dsi_padctrl.c
index fc25d11a8..ef72b85c9 100644
--- a/drivers/video/tegra/dc/dsi_padctrl.c
+++ b/drivers/video/tegra/dc/dsi_padctrl.c
@@ -220,7 +220,7 @@ struct tegra_dsi_padctrl *tegra_dsi_padctrl_init(struct tegra_dc *dc)
         int err;
 
         /* Padctrl module doesn't exist on fpga */
-        if (tegra_platform_is_linsim() || tegra_platform_is_fpga())
+        if (tegra_platform_is_fpga())
                 return NULL;
 
         dsi = tegra_dc_get_outdata(dc);
diff --git a/drivers/video/tegra/dc/edid.c b/drivers/video/tegra/dc/edid.c
index c28260809..748da1a6d 100644
--- a/drivers/video/tegra/dc/edid.c
+++ b/drivers/video/tegra/dc/edid.c
@@ -625,7 +625,7 @@ u16 tegra_edid_get_max_clk_rate(struct tegra_edid *edid)
 
 bool tegra_edid_is_scdc_present(struct tegra_edid *edid)
 {
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return false;
 
         if (!edid || !edid->data) {
diff --git a/drivers/video/tegra/dc/hdmi2.0.c b/drivers/video/tegra/dc/hdmi2.0.c
index fca376563..823e1c9ff 100644
--- a/drivers/video/tegra/dc/hdmi2.0.c
+++ b/drivers/video/tegra/dc/hdmi2.0.c
@@ -2660,9 +2660,6 @@ static void tegra_hdmi_config_clk(struct tegra_hdmi *hdmi, u32 clk_type)
         if (clk_type == hdmi->clk_type)
                 return;
 
-        if (tegra_platform_is_linsim())
-                return;
-
         if (clk_type == TEGRA_HDMI_BRICK_CLK) {
                 u32 val;
                 struct tegra_dc_sor_data *sor = hdmi->sor;
diff --git a/drivers/video/tegra/dc/null_or.c b/drivers/video/tegra/dc/null_or.c
index 73659e4b2..7887bd95a 100644
--- a/drivers/video/tegra/dc/null_or.c
+++ b/drivers/video/tegra/dc/null_or.c
@@ -245,7 +245,7 @@ static long tegra_dc_null_setup_clk(struct tegra_dc *dc, struct clk *clk)
         struct clk *base_clk;
         long rate;
 
-        if ((clk == NULL) || (parent_clk == NULL) || tegra_platform_is_linsim())
+        if ((clk == NULL) || (parent_clk == NULL))
                 return 0;
 
         if (dc->out != NULL)
diff --git a/drivers/video/tegra/dc/sor.c b/drivers/video/tegra/dc/sor.c
index 980630d1a..9633b9db9 100644
--- a/drivers/video/tegra/dc/sor.c
+++ b/drivers/video/tegra/dc/sor.c
@@ -51,7 +51,7 @@ tegra_dc_sor_poll_register(struct tegra_dc_sor_data *sor,
         unsigned long timeout_jf = jiffies + msecs_to_jiffies(timeout_ms);
         u32 reg_val = 0;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return 0;
 
         do {
@@ -323,7 +323,7 @@ static int dbg_sor_show(struct seq_file *s, void *unused)
         DUMP_REG(nv_sor_dp_misc1_override());
         DUMP_REG(nv_sor_dp_misc1_bit6());
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 DUMP_REG(NV_SOR_FPGA_HDMI_HEAD_SEL);
         hdmi_dump = 1; /* SOR and SOR1 have same registers */
 #else
@@ -501,8 +501,7 @@ static void tegra_sor_fpga_settings(struct tegra_dc *dc,
                         NV_SOR_FPGA_HDMI_HEAD_SEL_FPGA_HEAD1_OUT_EN_ENABLE;
 
         /* continue for system fpga and HDMI */
-        if ((!(tegra_platform_is_linsim() || tegra_platform_is_vdk())) ||
-                (dc->out->type != TEGRA_DC_OUT_HDMI))
+        if ((!tegra_platform_is_vdk()) || (dc->out->type != TEGRA_DC_OUT_HDMI))
                 return;
 
         if (dc->ndev->id == 0) {/* HEAD 0 */
@@ -1043,7 +1042,7 @@ static inline void tegra_dc_sor_update(struct tegra_dc_sor_data *sor)
 
 static void tegra_dc_sor_io_set_dpd(struct tegra_dc_sor_data *sor, bool up)
 {
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return;
 
         if (sor->io_padctrl) {
@@ -1408,7 +1407,7 @@ static void tegra_dc_sor_enable_dc(struct tegra_dc_sor_data *sor)
 
         reg_val = tegra_dc_readl(dc, DC_CMD_STATE_ACCESS);
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 tegra_dc_writel(dc, reg_val | WRITE_MUX_ASSEMBLY,
                         DC_CMD_STATE_ACCESS);
         else
@@ -1638,7 +1637,7 @@ void tegra_sor_start_dc(struct tegra_dc_sor_data *sor)
         tegra_dc_get(dc);
         reg_val = tegra_dc_readl(dc, DC_CMD_STATE_ACCESS);
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 tegra_dc_writel(dc, reg_val | WRITE_MUX_ASSEMBLY,
                         DC_CMD_STATE_ACCESS);
         else
@@ -1664,7 +1663,7 @@ void tegra_dc_sor_attach(struct tegra_dc_sor_data *sor)
 
         reg_val = tegra_dc_readl(dc, DC_CMD_STATE_ACCESS);
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 tegra_dc_writel(dc, reg_val | WRITE_MUX_ASSEMBLY,
                         DC_CMD_STATE_ACCESS);
         else
@@ -1739,7 +1738,7 @@ tegra_dc_sor_disable_win_short_raster(struct tegra_dc *dc, int *dc_reg_ctx)
 {
         int selected_windows, i;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return;
 
         selected_windows = tegra_dc_readl(dc, DC_CMD_DISPLAY_WINDOW_HEADER);
@@ -1788,7 +1787,7 @@ tegra_dc_sor_restore_win_and_raster(struct tegra_dc *dc, int *dc_reg_ctx)
 {
         int selected_windows, i;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return;
 
         selected_windows = tegra_dc_readl(dc, DC_CMD_DISPLAY_WINDOW_HEADER);
@@ -2065,7 +2064,7 @@ void tegra_dc_sor_disable(struct tegra_dc_sor_data *sor, bool is_lvds)
                 return;
         }
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return;
 
         /* Reset SOR */
@@ -2182,7 +2181,7 @@ void tegra_sor_setup_clk(struct tegra_dc_sor_data *sor, struct clk *clk,
         struct clk *dc_parent_clk;
         struct tegra_dc *dc = sor->dc;
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
+        if (tegra_platform_is_vdk())
                 return;
 
         if (clk == dc->clk) {
diff --git a/drivers/video/tegra/dc/window.c b/drivers/video/tegra/dc/window.c
index db79d8a38..47c12a2ce 100644
--- a/drivers/video/tegra/dc/window.c
+++ b/drivers/video/tegra/dc/window.c
@@ -1152,21 +1152,11 @@ void tegra_dc_trigger_windows(struct tegra_dc *dc)
                         tegra_dc_get_numof_dispwindows()) {
                 struct tegra_dc_win *win = tegra_dc_get_window(dc, i);
 
-                if (tegra_platform_is_linsim()) {
-                        /* FIXME: this is not needed when
-                           the simulator clears WIN_x_UPDATE
-                           bits as in HW */
-                        if (interlace_done) {
-                                win->dirty = 0;
-                                completed = 1;
-                        }
+                if (!(val & (WIN_A_ACT_REQ << i)) && interlace_done) {
+                        win->dirty = 0;
+                        completed = 1;
                 } else {
-                        if (!(val & (WIN_A_ACT_REQ << i)) && interlace_done) {
-                                win->dirty = 0;
-                                completed = 1;
-                        } else {
-                                dirty = 1;
-                        }
+                        dirty = 1;
                 }
         }