Commit f7c8a046 authored by Thomas Zimmermann's avatar Thomas Zimmermann

staging/sm750fb: Declare fb_ops as constant

Split up lynxfb_ops and declare each as constant. The fb_ops
instance used to be modified while initializing the driver. It is
now constant and the driver picks the correct instance, depending
on the settings for acceleration and cursor support.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Teddy Wang <teddy.wang@siliconmotion.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev
Acked-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231127131655.4020-26-tzimmermann@suse.de
parent e0f05e64
...@@ -663,16 +663,53 @@ static int sm750fb_set_drv(struct lynxfb_par *par) ...@@ -663,16 +663,53 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
return ret; return ret;
} }
static struct fb_ops lynxfb_ops = { static const struct fb_ops lynxfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_check_var = lynxfb_ops_check_var, .fb_check_var = lynxfb_ops_check_var,
.fb_set_par = lynxfb_ops_set_par, .fb_set_par = lynxfb_ops_set_par,
.fb_setcolreg = lynxfb_ops_setcolreg, .fb_setcolreg = lynxfb_ops_setcolreg,
.fb_blank = lynxfb_ops_blank, .fb_blank = lynxfb_ops_blank,
.fb_pan_display = lynxfb_ops_pan_display,
.fb_fillrect = cfb_fillrect, .fb_fillrect = cfb_fillrect,
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
.fb_copyarea = cfb_copyarea, .fb_copyarea = cfb_copyarea,
/* cursor */ };
static const struct fb_ops lynxfb_ops_with_cursor = {
.owner = THIS_MODULE,
.fb_check_var = lynxfb_ops_check_var,
.fb_set_par = lynxfb_ops_set_par,
.fb_setcolreg = lynxfb_ops_setcolreg,
.fb_blank = lynxfb_ops_blank,
.fb_pan_display = lynxfb_ops_pan_display,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_cursor = lynxfb_ops_cursor,
};
static const struct fb_ops lynxfb_ops_accel = {
.owner = THIS_MODULE,
.fb_check_var = lynxfb_ops_check_var,
.fb_set_par = lynxfb_ops_set_par,
.fb_setcolreg = lynxfb_ops_setcolreg,
.fb_blank = lynxfb_ops_blank,
.fb_pan_display = lynxfb_ops_pan_display,
.fb_fillrect = lynxfb_ops_fillrect,
.fb_copyarea = lynxfb_ops_copyarea,
.fb_imageblit = lynxfb_ops_imageblit,
};
static const struct fb_ops lynxfb_ops_accel_with_cursor = {
.owner = THIS_MODULE,
.fb_check_var = lynxfb_ops_check_var,
.fb_set_par = lynxfb_ops_set_par,
.fb_setcolreg = lynxfb_ops_setcolreg,
.fb_blank = lynxfb_ops_blank,
.fb_pan_display = lynxfb_ops_pan_display,
.fb_fillrect = lynxfb_ops_fillrect,
.fb_copyarea = lynxfb_ops_copyarea,
.fb_imageblit = lynxfb_ops_imageblit,
.fb_cursor = lynxfb_ops_cursor, .fb_cursor = lynxfb_ops_cursor,
}; };
...@@ -714,7 +751,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) ...@@ -714,7 +751,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
par->index = index; par->index = index;
output->channel = &crtc->channel; output->channel = &crtc->channel;
sm750fb_set_drv(par); sm750fb_set_drv(par);
lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
/* /*
* set current cursor variable and proc pointer, * set current cursor variable and proc pointer,
...@@ -731,19 +767,22 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) ...@@ -731,19 +767,22 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
crtc->cursor.vstart = sm750_dev->pvMem + crtc->cursor.offset; crtc->cursor.vstart = sm750_dev->pvMem + crtc->cursor.offset;
memset_io(crtc->cursor.vstart, 0, crtc->cursor.size); memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
if (!g_hwcursor) { if (!g_hwcursor)
lynxfb_ops.fb_cursor = NULL;
sm750_hw_cursor_disable(&crtc->cursor); sm750_hw_cursor_disable(&crtc->cursor);
}
/* set info->fbops, must be set before fb_find_mode */ /* set info->fbops, must be set before fb_find_mode */
if (!sm750_dev->accel_off) { if (!sm750_dev->accel_off) {
/* use 2d acceleration */ /* use 2d acceleration */
lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect; if (!g_hwcursor)
lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea; info->fbops = &lynxfb_ops_accel;
lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit; else
} info->fbops = &lynxfb_ops_accel_with_cursor;
} else {
if (!g_hwcursor)
info->fbops = &lynxfb_ops; info->fbops = &lynxfb_ops;
else
info->fbops = &lynxfb_ops_with_cursor;
}
if (!g_fbmode[index]) { if (!g_fbmode[index]) {
g_fbmode[index] = g_def_fbmode; g_fbmode[index] = g_def_fbmode;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment