Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fbdev-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
"Minor fbdev fixes for 3.14"
* tag 'fbdev-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: Kconfig: Allow more broad selection of the imxfb framebuffer driver.
video: exynos: Fix S6E8AX0 LCD driver build error
OMAPDSS: fix fck field types
OMAPDSS: DISPC: decimation rounding fix
+13
-12
+1
-1
drivers/video/Kconfig
+1
-1
drivers/video/Kconfig
+2
-1
drivers/video/exynos/Kconfig
+2
-1
drivers/video/exynos/Kconfig
···
22
22
23
23
config EXYNOS_LCD_S6E8AX0
24
24
bool "S6E8AX0 MIPI AMOLED LCD Driver"
25
-
depends on (EXYNOS_MIPI_DSI && BACKLIGHT_CLASS_DEVICE && LCD_CLASS_DEVICE)
25
+
depends on EXYNOS_MIPI_DSI && BACKLIGHT_CLASS_DEVICE
26
+
depends on (LCD_CLASS_DEVICE = y)
26
27
default n
27
28
help
28
29
If you have an S6E8AX0 MIPI AMOLED LCD Panel, say Y to enable its
+8
-8
drivers/video/omap2/dss/dispc.c
+8
-8
drivers/video/omap2/dss/dispc.c
···
2160
2160
*five_taps = false;
2161
2161
2162
2162
do {
2163
-
in_height = DIV_ROUND_UP(height, *decim_y);
2164
-
in_width = DIV_ROUND_UP(width, *decim_x);
2163
+
in_height = height / *decim_y;
2164
+
in_width = width / *decim_x;
2165
2165
*core_clk = dispc.feat->calc_core_clk(pclk, in_width,
2166
2166
in_height, out_width, out_height, mem_to_mem);
2167
2167
error = (in_width > maxsinglelinewidth || !*core_clk ||
···
2199
2199
dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
2200
2200
2201
2201
do {
2202
-
in_height = DIV_ROUND_UP(height, *decim_y);
2203
-
in_width = DIV_ROUND_UP(width, *decim_x);
2202
+
in_height = height / *decim_y;
2203
+
in_width = width / *decim_x;
2204
2204
*five_taps = in_height > out_height;
2205
2205
2206
2206
if (in_width > maxsinglelinewidth)
···
2268
2268
{
2269
2269
u16 in_width, in_width_max;
2270
2270
int decim_x_min = *decim_x;
2271
-
u16 in_height = DIV_ROUND_UP(height, *decim_y);
2271
+
u16 in_height = height / *decim_y;
2272
2272
const int maxsinglelinewidth =
2273
2273
dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
2274
2274
const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
···
2287
2287
return -EINVAL;
2288
2288
2289
2289
do {
2290
-
in_width = DIV_ROUND_UP(width, *decim_x);
2290
+
in_width = width / *decim_x;
2291
2291
} while (*decim_x <= *x_predecim &&
2292
2292
in_width > maxsinglelinewidth && ++*decim_x);
2293
2293
···
2466
2466
if (r)
2467
2467
return r;
2468
2468
2469
-
in_width = DIV_ROUND_UP(in_width, x_predecim);
2470
-
in_height = DIV_ROUND_UP(in_height, y_predecim);
2469
+
in_width = in_width / x_predecim;
2470
+
in_height = in_height / y_predecim;
2471
2471
2472
2472
if (color_mode == OMAP_DSS_COLOR_YUV2 ||
2473
2473
color_mode == OMAP_DSS_COLOR_UYVY ||
+1
-1
drivers/video/omap2/dss/dpi.c
+1
-1
drivers/video/omap2/dss/dpi.c