hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/video/fbdev/ps3fb.c
....@@ -29,6 +29,7 @@
2929 #include <linux/freezer.h>
3030 #include <linux/uaccess.h>
3131 #include <linux/fb.h>
32
+#include <linux/fbcon.h>
3233 #include <linux/init.h>
3334
3435 #include <asm/cell-regs.h>
....@@ -44,7 +45,7 @@
4445 #define GPU_CMD_BUF_SIZE (2 * 1024 * 1024)
4546 #define GPU_FB_START (64 * 1024)
4647 #define GPU_IOIF (0x0d000000UL)
47
-#define GPU_ALIGN_UP(x) _ALIGN_UP((x), 64)
48
+#define GPU_ALIGN_UP(x) ALIGN((x), 64)
4849 #define GPU_MAX_LINE_LENGTH (65536 - 64)
4950
5051 #define GPU_INTR_STATUS_VSYNC_0 0 /* vsync on head A */
....@@ -824,12 +825,12 @@
824825 var = info->var;
825826 fb_videomode_to_var(&var, vmode);
826827 console_lock();
827
- info->flags |= FBINFO_MISC_USEREVENT;
828828 /* Force, in case only special bits changed */
829829 var.activate |= FB_ACTIVATE_FORCE;
830830 par->new_mode_id = val;
831831 retval = fb_set_var(info, &var);
832
- info->flags &= ~FBINFO_MISC_USEREVENT;
832
+ if (!retval)
833
+ fbcon_update_vcs(info, var.activate & FB_ACTIVATE_ALL);
833834 console_unlock();
834835 }
835836 break;
....@@ -934,7 +935,7 @@
934935 }
935936
936937
937
-static struct fb_ops ps3fb_ops = {
938
+static const struct fb_ops ps3fb_ops = {
938939 .fb_open = ps3fb_open,
939940 .fb_release = ps3fb_release,
940941 .fb_read = fb_sys_read,
....@@ -1015,7 +1016,7 @@
10151016 }
10161017 #endif
10171018
1018
- max_ps3fb_size = _ALIGN_UP(GPU_IOIF, 256*1024*1024) - GPU_IOIF;
1019
+ max_ps3fb_size = ALIGN(GPU_IOIF, 256*1024*1024) - GPU_IOIF;
10191020 if (ps3fb_videomemory.size > max_ps3fb_size) {
10201021 dev_info(&dev->core, "Limiting ps3fb mem size to %lu bytes\n",
10211022 max_ps3fb_size);