diff options
| author | Sergiy Kibrik <sergiy.kibrik@globallogic.com> | 2012-09-05 16:18:28 +0300 |
|---|---|---|
| committer | Dmytro Kedrovskyi <x0169235@ti.com> | 2012-09-12 14:46:45 +0300 |
| commit | 472b1ac1d7c9357c9004333c038edb66fc4e7672 (patch) | |
| tree | b3c9f526b9dc7991a3b80f66f87b35a42fc15dda /drivers/video | |
| parent | 72cb6a5429f49bf04c1170e4f682d19241be1158 (diff) | |
| download | kernel_samsung_espresso10-472b1ac1d7c9357c9004333c038edb66fc4e7672.zip kernel_samsung_espresso10-472b1ac1d7c9357c9004333c038edb66fc4e7672.tar.gz kernel_samsung_espresso10-472b1ac1d7c9357c9004333c038edb66fc4e7672.tar.bz2 | |
OMAPDSS: DISPC: do not lose taps selection
Move taps selection logic before scaling check, so 3- of 5-tap always
get selected, no metter whether we do scaling or not.
Change-Id: I284b29933ca9fd69ae2088f279554dab9a66542c
Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 41af49b..df6ea83 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -2267,6 +2267,16 @@ int dispc_scaling_decision(u16 width, u16 height, in_width = DIV_ROUND_UP(width, x); in_height = DIV_ROUND_UP(height, y); + /* Use 5-tap filter unless must use 3-tap, + * even in no-scaling case, for not to lose sharpening filters + */ + if (!cpu_is_omap44xx()) + *five_taps = in_width <= 1024; + else if (omap_rev() == OMAP4430_REV_ES1_0) + *five_taps = in_width <= 1280; + else + *five_taps = true; + if (in_width == out_width && in_height == out_height) break; @@ -2277,13 +2287,6 @@ int dispc_scaling_decision(u16 width, u16 height, out_height < in_height / maxdownscale) goto loop; - /* Use 5-tap filter unless must use 3-tap */ - if (!cpu_is_omap44xx()) - *five_taps = in_width <= 1024; - else if (omap_rev() == OMAP4430_REV_ES1_0) - *five_taps = in_width <= 1280; - else - *five_taps = true; /* * Predecimation on OMAP4 still fetches the whole lines |