add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/video/fbdev/core/fbcon_cw.c
..
..
@@ -50,7 +50,7 @@
50
50
 {
51
51
 	struct fbcon_ops *ops = info->fbcon_par;
52
52
 	struct fb_copyarea area;
53
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
53
+	u32 vxres = GETVXRES(ops->p, info);
54
54
 
55
55
 	area.sx = vxres - ((sy + height) * vc->vc_font.height);
56
56
 	area.sy = sx * vc->vc_font.width;
..
..
@@ -68,7 +68,7 @@
68
68
 	struct fbcon_ops *ops = info->fbcon_par;
69
69
 	struct fb_fillrect region;
70
70
 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
71
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
71
+	u32 vxres = GETVXRES(ops->p, info);
72
72
 
73
73
 	region.color = attr_bgcol_ec(bgshift,vc,info);
74
74
 	region.dx = vxres - ((sy + height) * vc->vc_font.height);
..
..
@@ -125,7 +125,7 @@
125
125
 	u32 cnt, pitch, size;
126
126
 	u32 attribute = get_attribute(info, scr_readw(s));
127
127
 	u8 *dst, *buf = NULL;
128
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
128
+	u32 vxres = GETVXRES(ops->p, info);
129
129
 
130
130
 	if (!ops->fontbuffer)
131
131
 		return;
..
..
@@ -208,11 +208,11 @@
208
208
 	struct fbcon_ops *ops = info->fbcon_par;
209
209
 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
210
210
 	int w = (vc->vc_font.height + 7) >> 3, c;
211
-	int y = real_y(ops->p, vc->vc_y);
212
-	int attribute, use_sw = (vc->vc_cursor_type & 0x10);
211
+	int y = real_y(ops->p, vc->state.y);
212
+	int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
213
213
 	int err = 1, dx, dy;
214
214
 	char *src;
215
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
215
+	u32 vxres = GETVXRES(ops->p, info);
216
216
 
217
217
 	if (!ops->fontbuffer)
218
218
 		return;
..
..
@@ -258,7 +258,7 @@
258
258
 	}
259
259
 
260
260
 	dx = vxres - ((y * vc->vc_font.height) + vc->vc_font.height);
261
-	dy = vc->vc_x * vc->vc_font.width;
261
+	dy = vc->state.x * vc->vc_font.width;
262
262
 
263
263
 	if (ops->cursor_state.image.dx != dx ||
264
264
 	    ops->cursor_state.image.dy != dy ||
..
..
@@ -299,7 +299,7 @@
299
299
 		ops->p->cursor_shape = vc->vc_cursor_type;
300
300
 		cursor.set |= FB_CUR_SETSHAPE;
301
301
 
302
-		switch (ops->p->cursor_shape & CUR_HWMASK) {
302
+		switch (CUR_SIZE(ops->p->cursor_shape)) {
303
303
 		case CUR_NONE:
304
304
 			cur_height = 0;
305
305
 			break;
..
..
@@ -369,7 +369,7 @@
369
369
 static int cw_update_start(struct fb_info *info)
370
370
 {
371
371
 	struct fbcon_ops *ops = info->fbcon_par;
372
-	u32 vxres = GETVXRES(ops->p->scrollmode, info);
372
+	u32 vxres = GETVXRES(ops->p, info);
373
373
 	u32 xoffset;
374
374
 	int err;
375
375