Commit 962a3faf authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/udlfb: Use struct fb_info.screen_buffer 



Use info->screen_buffer when reading and writing framebuffers in
system memory. It's the correct pointer for this address space.

The struct fb_info has a union to store the framebuffer memory. This can
either be info->screen_base if the framebuffer is stored in I/O memory,
or info->screen_buffer if the framebuffer is stored in system memory.

As the driver operates on the latter address space, it is wrong to use
.screen_base and .screen_buffer must be used instead. This also gets
rid of casting needed due to not using the correct data type.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230428122452.4856-12-tzimmermann@suse.de
parent 6ca49268

drivers/video/fbdev/udlfb.c

+6 −6
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static void dlfb_ops_destroy(struct fb_info *info) 
		fb_dealloc_cmap(&info->cmap);

	if (info->monspecs.modedb)

		fb_destroy_modedb(info->monspecs.modedb);

	vfree(info->screen_base);

	vfree(info->screen_buffer);



	fb_destroy_modelist(&info->modelist);
@@ -1120,7 +1120,7 @@ static int dlfb_ops_set_par(struct fb_info *info) 


		/* paint greenscreen */



		pix_framebuffer = (u16 *) info->screen_base;

		pix_framebuffer = (u16 *)info->screen_buffer;

		for (i = 0; i < info->fix.smem_len / 2; i++)

			pix_framebuffer[i] = 0x37e6;

	}
@@ -1219,7 +1219,7 @@ static void dlfb_deferred_vfree(struct dlfb_data *dlfb, void *mem) 
static int dlfb_realloc_framebuffer(struct dlfb_data *dlfb, struct fb_info *info, u32 new_len)

{

	u32 old_len = info->fix.smem_len;

	const void *old_fb = (const void __force *)info->screen_base;

	const void *old_fb = info->screen_buffer;

	unsigned char *new_fb;

	unsigned char *new_back = NULL;
@@ -1236,12 +1236,12 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dlfb, struct fb_info *info 
		}

		memset(new_fb, 0xff, new_len);



		if (info->screen_base) {

		if (info->screen_buffer) {

			memcpy(new_fb, old_fb, old_len);

			dlfb_deferred_vfree(dlfb, (void __force *)info->screen_base);

			dlfb_deferred_vfree(dlfb, info->screen_buffer);

		}



		info->screen_base = (char __iomem *)new_fb;

		info->screen_buffer = new_fb;

		info->fix.smem_len = new_len;

		info->fix.smem_start = (unsigned long) new_fb;

		info->flags = udlfb_info_flags;