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

Commit 8803f7af authored by Krzysztof Helt's avatar Krzysztof Helt Committed by David S. Miller
Browse files

leo: use standard fields for framebuffer physical address and length 



Use standard fields fbinfo.fix.smem_start and fbinfo.fix.smem_len
for physical address and length of framebuffer.

This also fixes output of the 'fbset -i' command - address and length
of the framebuffer are displayed correctly.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 963b916c

drivers/video/leo.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -191,9 +191,7 @@ struct leo_par { 
	u32			flags;

	u32			flags;

#define LEO_FLAG_BLANKED	0x00000001

#define LEO_FLAG_BLANKED	0x00000001





	unsigned long		physbase;

	unsigned long		which_io;

	unsigned long		which_io;

	unsigned long		fbsize;

};

};





static void leo_wait(struct leo_lx_krn __iomem *lx_krn)

static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
@@ -420,16 +418,14 @@ static int leo_mmap(struct fb_info *info, struct vm_area_struct *vma) 
	struct leo_par *par = (struct leo_par *)info->par;

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





	return sbusfb_mmap_helper(leo_mmap_map,

	return sbusfb_mmap_helper(leo_mmap_map,

				  par->physbase, par->fbsize,

				  info->fix.smem_start, info->fix.smem_len,

				  par->which_io, vma);

				  par->which_io, vma);

}

}





static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)

static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)

{

{

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



	return sbusfb_ioctl_helper(cmd, arg, info,

	return sbusfb_ioctl_helper(cmd, arg, info,

				   FBTYPE_SUNLEO, 32, par->fbsize);

				   FBTYPE_SUNLEO, 32, info->fix.smem_len);

}

}





/*

/*
@@ -569,7 +565,7 @@ static int __devinit leo_probe(struct of_device *op, 




	spin_lock_init(&par->lock);

	spin_lock_init(&par->lock);





	par->physbase = op->resource[0].start;

	info->fix.smem_start = op->resource[0].start;

	par->which_io = op->resource[0].flags & IORESOURCE_BITS;

	par->which_io = op->resource[0].flags & IORESOURCE_BITS;





	sbusfb_fill_var(&info->var, dp, 32);

	sbusfb_fill_var(&info->var, dp, 32);
@@ -577,7 +573,7 @@ static int __devinit leo_probe(struct of_device *op, 




	linebytes = of_getintprop_default(dp, "linebytes",

	linebytes = of_getintprop_default(dp, "linebytes",

					  info->var.xres);

					  info->var.xres);

	par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);

	info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);





	par->lc_ss0_usr =

	par->lc_ss0_usr =

		of_ioremap(&op->resource[0], LEO_OFF_LC_SS0_USR,

		of_ioremap(&op->resource[0], LEO_OFF_LC_SS0_USR,
@@ -627,7 +623,7 @@ static int __devinit leo_probe(struct of_device *op, 




	printk(KERN_INFO "%s: leo at %lx:%lx\n",

	printk(KERN_INFO "%s: leo at %lx:%lx\n",

	       dp->full_name,

	       dp->full_name,

	       par->which_io, par->physbase);

	       par->which_io, info->fix.smem_start);





	return 0;

	return 0;