video: tegra: dc: report correct HDMI mode to TV

Reports correct aspect ratio and VIC to TV.

bug 1230953
bug 1227041

Change-Id: Ia973f526a50b679627b8fa74dde99bc405c86061
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/199716
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>
(cherry picked from commit b8aaa25591f02117ed7f799cd6c14a725deb61de)
Reviewed-on: http://git-master/r/213228
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 4484018f8cd6e480567d7b4dbcb48449612805f1..36eca8cbab24737cb2e6d2f613b4d118432d8a48 100644 (file)
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -816,7 +816,7 @@ static bool tegra_dc_hdmi_mode_filter(const struct tegra_dc *dc,
        if (!tegra_dc_check_constraint(mode))
                return false;
 
-       mode->flag = FB_MODE_IS_DETAILED;
+       mode->flag |= FB_MODE_IS_DETAILED;
        mode->refresh = (PICOS2KHZ(mode->pixclock) * 1000) /
                                tegra_dc_calc_clock_per_frame(mode);
        return true;
@@ -1622,9 +1622,8 @@ static int tegra_dc_find_cea_vic(const struct tegra_dc_mode *mode)
                                        return i;
                                if (m.flag & curr->flag & FB_FLAG_RATIO_16_9)
                                        return i;
-                       } else {
-                               return i;
                        }
+                       return i;
                }
        }
        return 0;