hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/video/fbdev/core/bitblit.c
....@@ -240,8 +240,8 @@
240240 struct fbcon_ops *ops = info->fbcon_par;
241241 unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
242242 int w = DIV_ROUND_UP(vc->vc_font.width, 8), c;
243
- int y = real_y(ops->p, vc->vc_y);
244
- int attribute, use_sw = (vc->vc_cursor_type & 0x10);
243
+ int y = real_y(ops->p, vc->state.y);
244
+ int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
245245 int err = 1;
246246 char *src;
247247
....@@ -277,10 +277,10 @@
277277 cursor.set |= FB_CUR_SETCMAP;
278278 }
279279
280
- if ((ops->cursor_state.image.dx != (vc->vc_font.width * vc->vc_x)) ||
280
+ if ((ops->cursor_state.image.dx != (vc->vc_font.width * vc->state.x)) ||
281281 (ops->cursor_state.image.dy != (vc->vc_font.height * y)) ||
282282 ops->cursor_reset) {
283
- ops->cursor_state.image.dx = vc->vc_font.width * vc->vc_x;
283
+ ops->cursor_state.image.dx = vc->vc_font.width * vc->state.x;
284284 ops->cursor_state.image.dy = vc->vc_font.height * y;
285285 cursor.set |= FB_CUR_SETPOS;
286286 }
....@@ -316,7 +316,7 @@
316316 ops->p->cursor_shape = vc->vc_cursor_type;
317317 cursor.set |= FB_CUR_SETSHAPE;
318318
319
- switch (ops->p->cursor_shape & CUR_HWMASK) {
319
+ switch (CUR_SIZE(ops->p->cursor_shape)) {
320320 case CUR_NONE:
321321 cur_height = 0;
322322 break;