video: tegra: dc: fix filtering during rotation

SCAN_COLUMN works on the input, filters work on the output. Only input
settings need to be swapped when in SCAN_COLUMN mode (270/90 rotation).

This removes an inadvertant swap of H and V for the filter capabilities.

Bug 1421307
Bug 1413155
Bug 1482737

Change-Id: I53017429fe4f554517ad9e054a0116582585bb56
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/403755
(cherry picked from commit f2d3ce1df0ccd8401aab554853401b5e3afa6859)
Reviewed-on: http://git-master/r/405927
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Michael Frydrych <mfrydrych@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>

diff --git a/drivers/video/tegra/dc/window.c b/drivers/video/tegra/dc/window.c
index a22b12b91a5199b64877e15ddf1db7fc913a85c7..c2511090c5455be15160b0aa7dde9c1d6763e00f 100644 (file)
--- a/drivers/video/tegra/dc/window.c
+++ b/drivers/video/tegra/dc/window.c
@@ -564,16 +564,12 @@ int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n)
                                DC_WIN_SIZE);
                }
 
-               /* Check scan_column flag to set window size and scaling. */
                win_options = WIN_ENABLE;
-               if (scan_column) {
+               if (scan_column)
                        win_options |= WIN_SCAN_COLUMN;
-                       win_options |= H_FILTER_ENABLE(filter_v);
-                       win_options |= V_FILTER_ENABLE(filter_h);
-               } else {
-                       win_options |= H_FILTER_ENABLE(filter_h);
-                       win_options |= V_FILTER_ENABLE(filter_v);
-               }
+
+               win_options |= H_FILTER_ENABLE(filter_h);
+               win_options |= V_FILTER_ENABLE(filter_v);
 
                /* Update scaling registers if window supports scaling. */
                if (likely(tegra_dc_feature_has_scaling(dc, win->idx)))