tegra: dc: remove NVDISPLAY ifdefs on hdmivrr

remove VRR_AUTHENTICATION_ENABLED macro and replace it with
inline api using runtime API to differentiate between chips.

Jira TDS-2719

Change-Id: I80cd71dfa562b71bc3489f6d258fc35b9dfe0794
Signed-off-by: Ishwarya Balaji Gururajan <igururajan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1646225
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 20 insertions, 20 deletions

diff --git a/drivers/video/tegra/dc/dp.c b/drivers/video/tegra/dc/dp.c
index 3847ea4c5..761cb2b09 100644
--- a/drivers/video/tegra/dc/dp.c
+++ b/drivers/video/tegra/dc/dp.c
@@ -2875,9 +2875,8 @@ static bool tegra_dp_mode_filter(const struct tegra_dc *dc,
 
 /* FIXME Bug: 1740464
  * */
-#ifdef VRR_AUTHENTICATION_ENABLED
-                capability = vrr->capability;
-#endif
+                if (tegra_dc_is_vrr_authentication_enabled())
+                        capability = vrr->capability;
 
                 if (capability) {
                         mode->upper_margin += 2;
diff --git a/drivers/video/tegra/dc/hdmivrr.c b/drivers/video/tegra/dc/hdmivrr.c
index 3a536045a..fb6d045ec 100644
--- a/drivers/video/tegra/dc/hdmivrr.c
+++ b/drivers/video/tegra/dc/hdmivrr.c
@@ -1,7 +1,7 @@
 /*
  * hdmivrr.c: hdmi vrr interface.
  *
- * Copyright (c) 2015-2017, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2015-2018, 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
@@ -735,10 +735,8 @@ void tegra_hdmivrr_update_monspecs(struct tegra_dc *dc,
         if (!vrr)
                 return;
 
-#ifdef VRR_AUTHENTICATION_ENABLED
-        if (!vrr->capability)
+        if (tegra_dc_is_vrr_authentication_enabled() && !vrr->capability)
                 return;
-#endif
 
         /* Check whether VRR modes were already added */
         list_for_each(pos, head) {
@@ -808,19 +806,19 @@ int tegra_hdmivrr_setup(struct tegra_hdmi *hdmi)
         /* TODO: Remove this conditional
          * once we have support for authentication
          * */
-#ifdef VRR_AUTHENTICATION_ENABLED
-        status = tegra_hdmivrr_is_vrr_capable(hdmi);
-        if (status)
-                goto fail;
+        if (tegra_dc_is_vrr_authentication_enabled()) {
+                status = tegra_hdmivrr_is_vrr_capable(hdmi);
+                if (status)
+                        goto fail;
 
-        status = tegra_hdmivrr_page_init(hdmi);
-        if (status)
-                goto fail;
+                status = tegra_hdmivrr_page_init(hdmi);
+                if (status)
+                        goto fail;
 
-        status = tegra_hdmivrr_authentication(hdmi, vrr);
-        if (status)
-                goto fail;
-#endif
+                status = tegra_hdmivrr_authentication(hdmi, vrr);
+                if (status)
+                        goto fail;
+        }
 
         vrr->capability = 1;
         goto exit;
diff --git a/drivers/video/tegra/dc/sor.h b/drivers/video/tegra/dc/sor.h
index f2e1ecb95..af45b2d33 100644
--- a/drivers/video/tegra/dc/sor.h
+++ b/drivers/video/tegra/dc/sor.h
@@ -17,8 +17,6 @@
 #ifndef __DRIVERS_VIDEO_TEGRA_DC_SOR_H__
 #define __DRIVERS_VIDEO_TEGRA_DC_SOR_H__
 
-#define VRR_AUTHENTICATION_ENABLED (!CONFIG_TEGRA_NVDISPLAY)
-
 #include <soc/tegra/chip-id.h>
 #include <linux/clk/tegra.h>
 #include <linux/reset.h>
@@ -277,6 +275,11 @@ void __attribute__((weak)) tegra_sor_program_fpga_clk_mux_t19x(
                                 struct tegra_dc_sor_data *sor);
 u32 __attribute__((weak)) tegra_sor_yuv420_8bpc_pixel_depth_t19x(void);
 
+static inline bool tegra_dc_is_vrr_authentication_enabled(void)
+{
+        return (!tegra_dc_is_nvdisplay());
+}
+
 static inline u32 nv_sor_head_state0(u32 i)
 {
         if (tegra_dc_is_t19x())