video: tegra: dc: add new vrr params

Add two new VRR cap parameters.
See bug 1684359, comment #3 for details.

Bug 1684359

Change-Id: Ifa37162a389975bcb24023d81176b026b7719da3
Signed-off-by: Daniel Solomon <daniels@nvidia.com>
Reviewed-on: http://git-master/r/797898
(cherry picked from commit eb129742e5d63aaa3864a439e0bab2608d24e1dc)
Reviewed-on: http://git-master/r/831116
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index 393f7de28247f33268536e79e15136767b3f7cae..141675f4621991289e1d127e92703b81f1f58ecc 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -666,6 +666,8 @@ struct tegra_vrr {
        s32     frame2flip_us;
        s32     adjust_vfp;
        s32     adjust_db;
+       u32 db_correct_cap;
+       u32 db_hist_cap;
        s32     vfp;
 
        s32     authenticated;

diff --git a/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi b/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
index fd1b0ba75951524e8a959bbb278bcad68f5129fb..ca6317cf0cc70271ea9b894adce87a94a635ad1c 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
+++ b/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
@@ -1229,6 +1229,8 @@
                                vrr-settings {
                                        nvidia,vrr_min_fps = <30>;
                                        nvidia,frame_len_fluct = <6667>;
+                                       nvidia,db_correct_cap = <4000>;
+                                       nvidia,db_hist_cap = <75000>;
                                };
                                display-timings {
                                        1200x1920-32-75Hz {

diff --git a/drivers/video/tegra/dc/of_dc.c b/drivers/video/tegra/dc/of_dc.c
index 1e75e34bc28eeab828ecf4a72dbbd30a7ce53de8..cd954dfc11fd207e0d1eec9a5896f01f125c1dcd 100644 (file)
--- a/drivers/video/tegra/dc/of_dc.c
+++ b/drivers/video/tegra/dc/of_dc.c
@@ -510,16 +510,28 @@ static int parse_vrr_settings(struct platform_device *ndev,
        u32 temp;
 
        if (!of_property_read_u32(np, "nvidia,vrr_min_fps", &temp)) {
-               vrr->vrr_min_fps = (unsigned) temp;
-               OF_DC_LOG("vrr_min_fps %d\n", vrr->vrr_min_fps);
+               vrr->vrr_min_fps = temp;
+               OF_DC_LOG("vrr_min_fps %u\n", temp);
        }
 
        if (!of_property_read_u32(np, "nvidia,frame_len_fluct", &temp)) {
-               vrr->frame_len_fluct = (unsigned) temp;
-               OF_DC_LOG("frame_len_fluct %d\n", vrr->frame_len_fluct);
+               vrr->frame_len_fluct = temp;
+               OF_DC_LOG("frame_len_fluct %u\n", temp);
        } else
                vrr->frame_len_fluct = 2000;
 
+       if (!of_property_read_u32(np, "nvidia,db_correct_cap", &temp)) {
+               vrr->db_correct_cap = temp;
+               OF_DC_LOG("db_correct_cap %u\n", temp);
+       } else
+               vrr->db_correct_cap = 0;
+
+       if (!of_property_read_u32(np, "nvidia,db_hist_cap", &temp)) {
+               vrr->db_hist_cap = temp;
+               OF_DC_LOG("db_hist_cap %u\n", temp);
+       } else
+               vrr->db_hist_cap = 0;
+
        /*
         * VRR capability is set when we have vrr_settings section in DT
         * vrr_settings, vrr_min_fps, and vrr_max_fps should always be