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

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

Merge tag 'fbdev-v4.13' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "There is nothing really major here, just a couple of small bugfixes,
  improvements and cleanups.

   - fix get_fb_unmapped_area() helper handling (Benjamin Gaignard)

   - check return value of clk_prepare_enable() in pxafb driver (Arvind
     Yadav)

   - fix error path handling in vmlfb driver (Alexey Khoroshilov)

   - printks fixes/cleanups for uvesafb driver (Joe Perches)

   - fix unusued variable warning in atyfb driver (Arnd Bergmann)

   - constifications for sh_mobile_lcdcfb, fsl-diu-fb, omapfb (Arvind
     Yadav)

   - mdacon driver cleanups (Jiri Slaby)

   - misc cleanups (Andy Shevchenko, Karim Eshapa, Gustavo A. R. Silva,
     Dan Carpenter)"

* tag 'fbdev-v4.13' of git://github.com/bzolnier/linux:
  fbdev: make get_fb_unmapped_area depends of !MMU
  atyfb: hide unused variable
  video: fbdev: matrox: the list iterator can't be NULL
  video: fbdev: aty: remove useless variable assignments in aty_var_to_crtc()
  fbdev: omapfb: constify ctrl_caps, color_caps, panel_attr_grp and ctrl_attr_grp
  omapfb: panel-dsi-cm: constify dsicm_attr_group
  vmlfb: Fix error handling in cr_pll_init()
  video: fbdev: fsl-diu-fb: constify mfb_template and fsl_diu_match.
  uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening
  video: fbdev: sh_mobile_lcdcfb: constify sh_mobile_lcdc_bl_ops.
  omapfb: Use sysfs_match_string() helper
  video: fbdev: pxafb: Handle return value of clk_prepare_enable
  video: fbdev: omap2: omapfb: displays: panel-dsi-cm: Use time comparison kernel macro.
  mdacon: replace MDA_ADDR macro by inline function
  mdacon: make mda_vram_base u16 *
  mdacon: align code in mda_detect properly
parents 38f7d2da 4c99ceda

drivers/video/console/mdacon.c

+51 −38
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static DEFINE_SPINLOCK(mda_lock); 


/* description of the hardware layout */



static unsigned long	mda_vram_base;		/* Base of video memory */

static u16		*mda_vram_base;		/* Base of video memory */

static unsigned long	mda_vram_len;		/* Size of video memory */

static unsigned int	mda_num_columns;	/* Number of text columns */

static unsigned int	mda_num_lines;		/* Number of text lines */
@@ -205,13 +205,20 @@ static int mda_detect(void) 


	/* do a memory check */



	p = (u16 *) mda_vram_base;

	q = (u16 *) (mda_vram_base + 0x01000);

	p = mda_vram_base;

	q = mda_vram_base + 0x01000 / 2;



	p_save = scr_readw(p); q_save = scr_readw(q);

	p_save = scr_readw(p);

	q_save = scr_readw(q);



	scr_writew(0xAA55, p);

	if (scr_readw(p) == 0xAA55)

		count++;



	scr_writew(0x55AA, p);

	if (scr_readw(p) == 0x55AA)

		count++;



	scr_writew(0xAA55, p); if (scr_readw(p) == 0xAA55) count++;

	scr_writew(0x55AA, p); if (scr_readw(p) == 0x55AA) count++;

	scr_writew(p_save, p);



	if (count != 2) {
@@ -220,13 +227,18 @@ static int mda_detect(void) 


	/* check if we have 4K or 8K */



	scr_writew(0xA55A, q); scr_writew(0x0000, p);

	if (scr_readw(q) == 0xA55A) count++;

	scr_writew(0xA55A, q);

	scr_writew(0x0000, p);

	if (scr_readw(q) == 0xA55A)

		count++;

	

	scr_writew(0x5AA5, q); scr_writew(0x0000, p);

	if (scr_readw(q) == 0x5AA5) count++;

	scr_writew(0x5AA5, q);

	scr_writew(0x0000, p);

	if (scr_readw(q) == 0x5AA5)

		count++;



	scr_writew(p_save, p); scr_writew(q_save, q);

	scr_writew(p_save, p);

	scr_writew(q_save, q);

	

	if (count == 4) {

		mda_vram_len = 0x02000;
@@ -240,14 +252,12 @@ static int mda_detect(void) 
	/* Edward: These two mess `tests' mess up my cursor on bootup */



	/* cursor low register */

	if (! test_mda_b(0x66, 0x0f)) {

	if (!test_mda_b(0x66, 0x0f))

		return 0;

	}



	/* cursor low register */

	if (! test_mda_b(0x99, 0x0f)) {

	if (!test_mda_b(0x99, 0x0f))

		return 0;

	}

#endif



	/* See if the card is a Hercules, by checking whether the vsync
@@ -313,7 +323,7 @@ static const char *mdacon_startup(void) 
	mda_num_lines   = 25;



	mda_vram_len  = 0x01000;

	mda_vram_base = VGA_MAP_MEM(0xb0000, mda_vram_len);

	mda_vram_base = (u16 *)VGA_MAP_MEM(0xb0000, mda_vram_len);



	mda_index_port  = 0x3b4;

	mda_value_port  = 0x3b5;
@@ -410,17 +420,20 @@ static void mdacon_invert_region(struct vc_data *c, u16 *p, int count) 
	}

}



#define MDA_ADDR(x,y)  ((u16 *) mda_vram_base + (y)*mda_num_columns + (x))

static inline u16 *mda_addr(unsigned int x, unsigned int y)

{

	return mda_vram_base + y * mda_num_columns + x;

}



static void mdacon_putc(struct vc_data *c, int ch, int y, int x)

{

	scr_writew(mda_convert_attr(ch), MDA_ADDR(x, y));

	scr_writew(mda_convert_attr(ch), mda_addr(x, y));

}



static void mdacon_putcs(struct vc_data *c, const unsigned short *s,

		         int count, int y, int x)

{

	u16 *dest = MDA_ADDR(x, y);

	u16 *dest = mda_addr(x, y);



	for (; count > 0; count--) {

		scr_writew(mda_convert_attr(scr_readw(s++)), dest++);
@@ -430,7 +443,7 @@ static void mdacon_putcs(struct vc_data *c, const unsigned short *s, 
static void mdacon_clear(struct vc_data *c, int y, int x, 

			  int height, int width)

{

	u16 *dest = MDA_ADDR(x, y);

	u16 *dest = mda_addr(x, y);

	u16 eattr = mda_convert_attr(c->vc_video_erase_char);



	if (width <= 0 || height <= 0)
@@ -453,7 +466,7 @@ static int mdacon_blank(struct vc_data *c, int blank, int mode_switch) 
{

	if (mda_type == TYPE_MDA) {

		if (blank) 

			scr_memsetw((void *)mda_vram_base, 

			scr_memsetw(mda_vram_base,

				mda_convert_attr(c->vc_video_erase_char),

				c->vc_screenbuf_size);

		/* Tell console.c that it has to restore the screen itself */
@@ -502,16 +515,16 @@ static bool mdacon_scroll(struct vc_data *c, unsigned int t, unsigned int b, 
	switch (dir) {



	case SM_UP:

		scr_memmovew(MDA_ADDR(0,t), MDA_ADDR(0,t+lines),

		scr_memmovew(mda_addr(0, t), mda_addr(0, t + lines),

				(b-t-lines)*mda_num_columns*2);

		scr_memsetw(MDA_ADDR(0,b-lines), eattr,

		scr_memsetw(mda_addr(0, b - lines), eattr,

				lines*mda_num_columns*2);

		break;



	case SM_DOWN:

		scr_memmovew(MDA_ADDR(0,t+lines), MDA_ADDR(0,t),

		scr_memmovew(mda_addr(0, t + lines), mda_addr(0, t),

				(b-t-lines)*mda_num_columns*2);

		scr_memsetw(MDA_ADDR(0,t), eattr, lines*mda_num_columns*2);

		scr_memsetw(mda_addr(0, t), eattr, lines*mda_num_columns*2);

		break;

	}

drivers/video/fbdev/aty/atyfb_base.c

+2 −8
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ static int aty_var_to_crtc(const struct fb_info *info, 
{

	struct atyfb_par *par = (struct atyfb_par *) info->par;

	u32 xres, yres, vxres, vyres, xoffset, yoffset, bpp;

	u32 sync, vmode, vdisplay;

	u32 sync, vmode;

	u32 h_total, h_disp, h_sync_strt, h_sync_end, h_sync_dly, h_sync_wid, h_sync_pol;

	u32 v_total, v_disp, v_sync_strt, v_sync_end, v_sync_wid, v_sync_pol, c_sync;

	u32 pix_width, dp_pix_width, dp_chain_mask;
@@ -984,12 +984,6 @@ static int aty_var_to_crtc(const struct fb_info *info, 
		v_total <<= 1;

	}



	vdisplay = yres;

#ifdef CONFIG_FB_ATY_GENERIC_LCD

	if ((par->lcd_table != 0) && (crtc->lcd_gen_cntl & LCD_ON))

		vdisplay  = par->lcd_height;

#endif



	v_disp--;

	v_sync_strt--;

	v_sync_end--;
@@ -1036,7 +1030,7 @@ static int aty_var_to_crtc(const struct fb_info *info, 
		crtc->gen_cntl |= CRTC_INTERLACE_EN;

#ifdef CONFIG_FB_ATY_GENERIC_LCD

	if (par->lcd_table != 0) {

		vdisplay = yres;

		u32 vdisplay = yres;

		if (vmode & FB_VMODE_DOUBLE)

			vdisplay <<= 1;

		crtc->gen_cntl &= ~(CRTC2_EN | CRTC2_PIX_WIDTH);

drivers/video/fbdev/core/fbmem.c

+3 −2
Original line number Diff line number Diff line
@@ -1483,7 +1483,7 @@ __releases(&info->lock) 
	return 0;

}



#ifdef CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA

#if defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA) && !defined(CONFIG_MMU)

unsigned long get_fb_unmapped_area(struct file *filp,

				   unsigned long addr, unsigned long len,

				   unsigned long pgoff, unsigned long flags)
@@ -1510,7 +1510,8 @@ static const struct file_operations fb_fops = { 
	.open =		fb_open,

	.release =	fb_release,

#if defined(HAVE_ARCH_FB_UNMAPPED_AREA) || \

    defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA)

	(defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA) && \

	 !defined(CONFIG_MMU))

	.get_unmapped_area = get_fb_unmapped_area,

#endif

#ifdef CONFIG_FB_DEFERRED_IO

drivers/video/fbdev/fsl-diu-fb.c

+2 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ struct fsl_diu_data { 
/* Determine the DMA address of a member of the fsl_diu_data structure */

#define DMA_ADDR(p, f) ((p)->dma_addr + offsetof(struct fsl_diu_data, f))



static struct mfb_info mfb_template[] = {

static const struct mfb_info mfb_template[] = {

	{

		.index = PLANE0,

		.id = "Panel0",
@@ -1868,7 +1868,7 @@ static int __init fsl_diu_setup(char *options) 
}

#endif



static struct of_device_id fsl_diu_match[] = {

static const struct of_device_id fsl_diu_match[] = {

#ifdef CONFIG_PPC_MPC512x

	{

		.compatible = "fsl,mpc5121-diu",

drivers/video/fbdev/matrox/matroxfb_base.c

+1 −1
Original line number Diff line number Diff line
@@ -2001,7 +2001,7 @@ static void matroxfb_register_device(struct matrox_fb_info* minfo) { 
	for (drv = matroxfb_driver_l(matroxfb_driver_list.next);

	     drv != matroxfb_driver_l(&matroxfb_driver_list);

	     drv = matroxfb_driver_l(drv->node.next)) {

		if (drv && drv->probe) {

		if (drv->probe) {

			void *p = drv->probe(minfo);

			if (p) {

				minfo->drivers_data[i] = p;