Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc25256 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5e57dc81 b359bb0d

drivers/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/video/exynos/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/video/omap2/dss/dispc.c

+8 −8
Original line number Diff line number Diff line
@@ -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 ||

drivers/video/omap2/dss/dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

drivers/video/omap2/dss/sdi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

};