diff options
author | William Pierce <wpierce@nvidia.com> | 2017-05-18 12:21:00 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-07-26 21:56:24 -0400 |
commit | 0f813559ccfa121072784e3914aa4d32023851e6 (patch) | |
tree | 3012b509cfb60c9053755ee6d2e7d37c8f28ddb6 /drivers/video/tegra/dc/dp.c | |
parent | 2f37ad6e7494533881795cd7ad17384221c90f64 (diff) |
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>
Diffstat (limited to 'drivers/video/tegra/dc/dp.c')
-rw-r--r-- | drivers/video/tegra/dc/dp.c | 11 |
1 files changed, 4 insertions, 7 deletions
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) | |||
105 | 105 | ||
106 | #define is_hotplug_supported(dp) \ | 106 | #define is_hotplug_supported(dp) \ |
107 | ({ \ | 107 | ({ \ |
108 | !tegra_platform_is_linsim() && \ | ||
109 | tegra_dc_is_ext_dp_panel(dp->dc); \ | 108 | tegra_dc_is_ext_dp_panel(dp->dc); \ |
110 | }) | 109 | }) |
111 | 110 | ||
@@ -133,7 +132,7 @@ tegra_dc_dpaux_poll_register(struct tegra_dc_dp_data *dp, | |||
133 | unsigned long timeout_jf = jiffies + msecs_to_jiffies(timeout_ms); | 132 | unsigned long timeout_jf = jiffies + msecs_to_jiffies(timeout_ms); |
134 | u32 reg_val = 0; | 133 | u32 reg_val = 0; |
135 | 134 | ||
136 | if (tegra_platform_is_linsim() || tegra_platform_is_vdk()) | 135 | if (tegra_platform_is_vdk()) |
137 | return 0; | 136 | return 0; |
138 | 137 | ||
139 | do { | 138 | do { |
@@ -2611,7 +2610,7 @@ static void tegra_dp_hpd_op_edid_recheck(void *drv_data) | |||
2611 | 2610 | ||
2612 | static inline void tegra_dp_reset(struct tegra_dc_dp_data *dp) | 2611 | static inline void tegra_dp_reset(struct tegra_dc_dp_data *dp) |
2613 | { | 2612 | { |
2614 | if (tegra_platform_is_linsim() || tegra_platform_is_vdk()) | 2613 | if (tegra_platform_is_vdk()) |
2615 | return; | 2614 | return; |
2616 | 2615 | ||
2617 | if (!dp || !dp->dpaux) | 2616 | if (!dp || !dp->dpaux) |
@@ -3162,9 +3161,7 @@ static bool tegra_dc_dp_hpd_state(struct tegra_dc *dc) | |||
3162 | if (WARN_ON(!dc || !dc->out)) | 3161 | if (WARN_ON(!dc || !dc->out)) |
3163 | return false; | 3162 | return false; |
3164 | 3163 | ||
3165 | if (dc->out->type == TEGRA_DC_OUT_FAKE_DP || | 3164 | if (dc->out->type == TEGRA_DC_OUT_FAKE_DP || tegra_platform_is_vdk()) |
3166 | tegra_platform_is_linsim() || | ||
3167 | tegra_platform_is_vdk()) | ||
3168 | return true; | 3165 | return true; |
3169 | 3166 | ||
3170 | tegra_dpaux_clk_en(dpaux); | 3167 | tegra_dpaux_clk_en(dpaux); |
@@ -3251,7 +3248,7 @@ static void tegra_dc_dp_modeset_notifier(struct tegra_dc *dc) | |||
3251 | tegra_dc_sor_modeset_notifier(dp->sor, false); | 3248 | tegra_dc_sor_modeset_notifier(dp->sor, false); |
3252 | /* Pixel clock may be changed in new mode, | 3249 | /* Pixel clock may be changed in new mode, |
3253 | * recalculate link config */ | 3250 | * recalculate link config */ |
3254 | if (!(tegra_platform_is_linsim() || tegra_platform_is_vdk())) | 3251 | if (!(tegra_platform_is_vdk())) |
3255 | tegra_dc_dp_calc_config(dp, dp->mode, &dp->link_cfg); | 3252 | tegra_dc_dp_calc_config(dp, dp->mode, &dp->link_cfg); |
3256 | 3253 | ||
3257 | 3254 | ||