openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fbdev fixes for 3.14. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS/dwfAAoJEPo9qoy8lh71CWYP/1lnhNUMYZaf4voIasDmMPXF
 cgKF5kIfu3WZ/YBbepc/Q+ouD2ePV6g3D8CmwEmTCvZlAXD0qXDJT4FiLuGT8d3d
 8DtHvPi+vz7qr36kXUokn42qM6O8MSqvuC8JZFsI1BmcjzHKNQtDRcI4DxBdDsXF
 U0SLu5JiF9/CHU8ITiIvzJOgsWEemiYfQ/zKq5XGrgx9/8nwCCv0bOjEgnj+blXC
 MK6Kj2J5GKpeiYDz1E4GLC49Xm9RFRoo+yLgE5rq/jaPv2nfzULw2bd9OpTQuJsz
 q/xWBKlBlCLaYeQbbvuHNZFGA2G7UFAPvo8ztWDq1m/ELvVw8lp0D9hL13XwEIUh
 DONWYiff0eQbeWgFB5Z1s/nzTrAEu7kyn+0YYRK+p+ZPpbONxJKCddjPCchVQl0c
 UjKxvvoWHP4sGSinXoXzvo4BXGpdzAm+ejmEC7WjIB3+ETN9LtAicTc2yKMLizyX
 kS7aqVo5IKsbz8a6Jvil+aO9+Mn3K3nGH7il2N0SALav1QhC4X0IrRpgCLdPUDHO
 Xp1dzgTvrslT9PxevkkaXl8ULc/v7RpBkZljTSgCgKGvDi+QF9X8LVQMW3+drux2
 qIvKFMrKHr1FuCAUd1nLt5n83PcUihvmeSnobVpkS9ZG42Fl+OQyg/37L3CqcwZC
 pDvNgeSbuhjcKHfWtMVn
 =TX8g
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-02-14 11:04:54 -08:00
parent 5e57dc8110 b359bb0d9c
commit cbc252566c
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/Kconfig
View File

@ -364,7 +364,7 @@ config FB_SA1100
config FB_IMX
tristate "Freescale i.MX1/21/25/27 LCD support"
depends on FB && IMX_HAVE_PLATFORM_IMX_FB
depends on FB && ARCH_MXC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT

3
drivers/video/exynos/Kconfig
View File

@ -22,7 +22,8 @@ config EXYNOS_MIPI_DSI
config EXYNOS_LCD_S6E8AX0
bool "S6E8AX0 MIPI AMOLED LCD Driver"
depends on (EXYNOS_MIPI_DSI && BACKLIGHT_CLASS_DEVICE && LCD_CLASS_DEVICE)
depends on EXYNOS_MIPI_DSI && BACKLIGHT_CLASS_DEVICE
depends on (LCD_CLASS_DEVICE = y)
default n
help
If you have an S6E8AX0 MIPI AMOLED LCD Panel, say Y to enable its

16
drivers/video/omap2/dss/dispc.c
View File

@ -2160,8 +2160,8 @@ static int dispc_ovl_calc_scaling_24xx(unsigned long pclk, unsigned long lclk,
*five_taps = false;
do {
in_height = DIV_ROUND_UP(height, *decim_y);
in_width = DIV_ROUND_UP(width, *decim_x);
in_height = height / *decim_y;
in_width = width / *decim_x;
*core_clk = dispc.feat->calc_core_clk(pclk, in_width,
in_height, out_width, out_height, mem_to_mem);
error = (in_width > maxsinglelinewidth || !*core_clk ||
@ -2199,8 +2199,8 @@ static int dispc_ovl_calc_scaling_34xx(unsigned long pclk, unsigned long lclk,
dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
do {
in_height = DIV_ROUND_UP(height, *decim_y);
in_width = DIV_ROUND_UP(width, *decim_x);
in_height = height / *decim_y;
in_width = width / *decim_x;
*five_taps = in_height > out_height;
if (in_width > maxsinglelinewidth)
@ -2268,7 +2268,7 @@ static int dispc_ovl_calc_scaling_44xx(unsigned long pclk, unsigned long lclk,
{
u16 in_width, in_width_max;
int decim_x_min = *decim_x;
u16 in_height = DIV_ROUND_UP(height, *decim_y);
u16 in_height = height / *decim_y;
const int maxsinglelinewidth =
dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
@ -2287,7 +2287,7 @@ static int dispc_ovl_calc_scaling_44xx(unsigned long pclk, unsigned long lclk,
return -EINVAL;
do {
in_width = DIV_ROUND_UP(width, *decim_x);
in_width = width / *decim_x;
} while (*decim_x <= *x_predecim &&
in_width > maxsinglelinewidth && ++*decim_x);
@ -2466,8 +2466,8 @@ static int dispc_ovl_setup_common(enum omap_plane plane,
if (r)
return r;
in_width = DIV_ROUND_UP(in_width, x_predecim);
in_height = DIV_ROUND_UP(in_height, y_predecim);
in_width = in_width / x_predecim;
in_height = in_height / y_predecim;
if (color_mode == OMAP_DSS_COLOR_YUV2 ||
color_mode == OMAP_DSS_COLOR_UYVY ||

2
drivers/video/omap2/dss/dpi.c
View File

@ -117,7 +117,7 @@ struct dpi_clk_calc_ctx {
/* outputs */
struct dsi_clock_info dsi_cinfo;
unsigned long long fck;
unsigned long fck;
struct dispc_clock_info dispc_cinfo;
};

2
drivers/video/omap2/dss/sdi.c
View File

@ -46,7 +46,7 @@ static struct {
struct sdi_clk_calc_ctx {
unsigned long pck_min, pck_max;
unsigned long long fck;
unsigned long fck;
struct dispc_clock_info dispc_cinfo;
};