diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2014-04-30 10:28:03 -0700 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-05-21 17:51:46 -0700 |
| commit | 059af69c5f6b74cddd75d1be8488f48a19f96a88 (patch) | |
| tree | bfb2db1ba69ca49efae831a06a7e317c294b4ca7 /drivers | |
| parent | 7d3a028f3bac6a5198e9782b1e5fb37bd38b7e2d (diff) | |
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)
Signed-off-by: David Yu <davyu@nvidia.com>
Reviewed-on: http://git-master/r/412020
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/dc/window.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/video/tegra/dc/window.c b/drivers/video/tegra/dc/window.c index 58113ab652cb..50f966bb86e6 100644 --- a/drivers/video/tegra/dc/window.c +++ b/drivers/video/tegra/dc/window.c @@ -3,7 +3,7 @@ * * Copyright (C) 2010 Google, Inc. * - * Copyright (c) 2010-2013, NVIDIA CORPORATION, All rights reserved. + * Copyright (c) 2010-2014, 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 @@ -407,16 +407,12 @@ int tegra_dc_update_windows(struct tegra_dc_win *windows[], int n) V_SIZE(win->out_h) | H_SIZE(win->out_w), 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))) |