Skip to content

Commit 962a3fa

Browse files
committed
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: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230428122452.4856-12-tzimmermann@suse.de
1 parent 6ca4926 commit 962a3fa

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/video/fbdev/udlfb.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ static void dlfb_ops_destroy(struct fb_info *info)
10061006
fb_dealloc_cmap(&info->cmap);
10071007
if (info->monspecs.modedb)
10081008
fb_destroy_modedb(info->monspecs.modedb);
1009-
vfree(info->screen_base);
1009+
vfree(info->screen_buffer);
10101010

10111011
fb_destroy_modelist(&info->modelist);
10121012

@@ -1120,7 +1120,7 @@ static int dlfb_ops_set_par(struct fb_info *info)
11201120

11211121
/* paint greenscreen */
11221122

1123-
pix_framebuffer = (u16 *) info->screen_base;
1123+
pix_framebuffer = (u16 *)info->screen_buffer;
11241124
for (i = 0; i < info->fix.smem_len / 2; i++)
11251125
pix_framebuffer[i] = 0x37e6;
11261126
}
@@ -1219,7 +1219,7 @@ static void dlfb_deferred_vfree(struct dlfb_data *dlfb, void *mem)
12191219
static int dlfb_realloc_framebuffer(struct dlfb_data *dlfb, struct fb_info *info, u32 new_len)
12201220
{
12211221
u32 old_len = info->fix.smem_len;
1222-
const void *old_fb = (const void __force *)info->screen_base;
1222+
const void *old_fb = info->screen_buffer;
12231223
unsigned char *new_fb;
12241224
unsigned char *new_back = NULL;
12251225

@@ -1236,12 +1236,12 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dlfb, struct fb_info *info
12361236
}
12371237
memset(new_fb, 0xff, new_len);
12381238

1239-
if (info->screen_base) {
1239+
if (info->screen_buffer) {
12401240
memcpy(new_fb, old_fb, old_len);
1241-
dlfb_deferred_vfree(dlfb, (void __force *)info->screen_base);
1241+
dlfb_deferred_vfree(dlfb, info->screen_buffer);
12421242
}
12431243

1244-
info->screen_base = (char __iomem *)new_fb;
1244+
info->screen_buffer = new_fb;
12451245
info->fix.smem_len = new_len;
12461246
info->fix.smem_start = (unsigned long) new_fb;
12471247
info->flags = udlfb_info_flags;

0 commit comments

Comments
 (0)