diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2013-12-09 13:51:24 -0800 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-05-21 17:51:29 -0700 |
| commit | 7d3a028f3bac6a5198e9782b1e5fb37bd38b7e2d (patch) | |
| tree | 1d23a118b76c0f5becddba97a2977ce40cba1fdb | |
| parent | 508a57c332c65b5c42840c08b0eb952851d9b69a (diff) | |
video: tegra: dc: swap rotated h/v filter check
When determining if the filter should be disabled because input == output,
use the SCAN_COLUMN flag to select the correct dimension.
Bug 1421307
Bug 1413155
Bug 1482737
Change-Id: I19dd5575fb41d8a2b6aa3ee12022acd14232afe4
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/340037
(cherry picked from commit 08f1bbbfd9c7484d38db8f4eac3868fa0e9d22c3)
Signed-off-by: David Yu <davyu@nvidia.com>
Reviewed-on: http://git-master/r/412018
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/dc/dc_config.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/video/tegra/dc/dc_config.h b/drivers/video/tegra/dc/dc_config.h index 0ef076c2d3e1..64ef329ea2dd 100644 --- a/drivers/video/tegra/dc/dc_config.h +++ b/drivers/video/tegra/dc/dc_config.h @@ -1,6 +1,6 @@ /* - * drivers/video/tegra/dc/dc_config.c - * Copyright (c) 2010-2012, NVIDIA CORPORATION, All rights reserved. + * drivers/video/tegra/dc/dc_config.h + * Copyright (c) 2010-2014, NVIDIA CORPORATION, All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -159,13 +159,17 @@ static inline bool win_use_v_filter(struct tegra_dc *dc, const struct tegra_dc_win *win) { return tegra_dc_feature_has_filter(dc, win->idx, HAS_V_FILTER) && - win->h.full != dfixed_const(win->out_h); + (win->flags & TEGRA_WIN_FLAG_SCAN_COLUMN ? + win->w.full != dfixed_const(win->out_h) + : win->h.full != dfixed_const(win->out_h)); } static inline bool win_use_h_filter(struct tegra_dc *dc, const struct tegra_dc_win *win) { return tegra_dc_feature_has_filter(dc, win->idx, HAS_H_FILTER) && - win->w.full != dfixed_const(win->out_w); + (win->flags & TEGRA_WIN_FLAG_SCAN_COLUMN ? + win->h.full != dfixed_const(win->out_w) + : win->w.full != dfixed_const(win->out_w)); } #endif |