enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/video/console/vgacon.c
..
..
@@ -113,9 +113,9 @@
113
113
 {
114
114
 	vgacon_text_mode_force = true;
115
115
 
116
-	pr_warning("You have booted with nomodeset. This means your GPU drivers are DISABLED\n");
117
-	pr_warning("Any video related functionality will be severely degraded, and you may not even be able to suspend the system properly\n");
118
-	pr_warning("Unless you actually understand what nomodeset does, you should reboot without enabling it\n");
116
+	pr_warn("You have booted with nomodeset. This means your GPU drivers are DISABLED\n");
117
+	pr_warn("Any video related functionality will be severely degraded, and you may not even be able to suspend the system properly\n");
118
+	pr_warn("Unless you actually understand what nomodeset does, you should reboot without enabling it\n");
119
119
 
120
120
 	return 1;
121
121
 }
..
..
@@ -421,8 +421,10 @@
421
421
 	con_set_default_unimap(c);
422
422
 }
423
423
 
424
-static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
425
-			    u8 blink, u8 underline, u8 reverse, u8 italic)
424
+static u8 vgacon_build_attr(struct vc_data *c, u8 color,
425
+			    enum vc_intensity intensity,
426
+			    bool blink, bool underline, bool reverse,
427
+			    bool italic)
426
428
 {
427
429
 	u8 attr = color;
428
430
 
..
..
@@ -431,7 +433,7 @@
431
433
 			attr = (attr & 0xF0) | c->vc_itcolor;
432
434
 		else if (underline)
433
435
 			attr = (attr & 0xf0) | c->vc_ulcolor;
434
-		else if (intensity == 0)
436
+		else if (intensity == VCI_HALF_BRIGHT)
435
437
 			attr = (attr & 0xf0) | c->vc_halfcolor;
436
438
 	}
437
439
 	if (reverse)
..
..
@@ -440,14 +442,14 @@
440
442
 				       0x77);
441
443
 	if (blink)
442
444
 		attr ^= 0x80;
443
-	if (intensity == 2)
445
+	if (intensity == VCI_BOLD)
444
446
 		attr ^= 0x08;
445
447
 	if (!vga_can_do_color) {
446
448
 		if (italic)
447
449
 			attr = (attr & 0xF8) | 0x02;
448
450
 		else if (underline)
449
451
 			attr = (attr & 0xf8) | 0x01;
450
-		else if (intensity == 0)
452
+		else if (intensity == VCI_HALF_BRIGHT)
451
453
 			attr = (attr & 0xf0) | 0x08;
452
454
 	}
453
455
 	return attr;
..
..
@@ -510,17 +512,17 @@
510
512
 	case CM_ERASE:
511
513
 		write_vga(14, (c->vc_pos - vga_vram_base) / 2);
512
514
 	        if (vga_video_type >= VIDEO_TYPE_VGAC)
513
-			vgacon_set_cursor_size(c->vc_x, 31, 30);
515
+			vgacon_set_cursor_size(c->state.x, 31, 30);
514
516
 		else
515
-			vgacon_set_cursor_size(c->vc_x, 31, 31);
517
+			vgacon_set_cursor_size(c->state.x, 31, 31);
516
518
 		break;
517
519
 
518
520
 	case CM_MOVE:
519
521
 	case CM_DRAW:
520
522
 		write_vga(14, (c->vc_pos - vga_vram_base) / 2);
521
-		switch (c->vc_cursor_type & 0x0f) {
523
+		switch (CUR_SIZE(c->vc_cursor_type)) {
522
524
 		case CUR_UNDERLINE:
523
-			vgacon_set_cursor_size(c->vc_x,
525
+			vgacon_set_cursor_size(c->state.x,
524
526
 					       c->vc_cell_height -
525
527
 					       (c->vc_cell_height <
526
528
 						10 ? 2 : 3),
..
..
@@ -529,21 +531,21 @@
529
531
 						10 ? 1 : 2));
530
532
 			break;
531
533
 		case CUR_TWO_THIRDS:
532
-			vgacon_set_cursor_size(c->vc_x,
534
+			vgacon_set_cursor_size(c->state.x,
533
535
 					       c->vc_cell_height / 3,
534
536
 					       c->vc_cell_height -
535
537
 					       (c->vc_cell_height <
536
538
 						10 ? 1 : 2));
537
539
 			break;
538
540
 		case CUR_LOWER_THIRD:
539
-			vgacon_set_cursor_size(c->vc_x,
541
+			vgacon_set_cursor_size(c->state.x,
540
542
 					       (c->vc_cell_height * 2) / 3,
541
543
 					       c->vc_cell_height -
542
544
 					       (c->vc_cell_height <
543
545
 						10 ? 1 : 2));
544
546
 			break;
545
547
 		case CUR_LOWER_HALF:
546
-			vgacon_set_cursor_size(c->vc_x,
548
+			vgacon_set_cursor_size(c->state.x,
547
549
 					       c->vc_cell_height / 2,
548
550
 					       c->vc_cell_height -
549
551
 					       (c->vc_cell_height <
..
..
@@ -551,12 +553,12 @@
551
553
 			break;
552
554
 		case CUR_NONE:
553
555
 			if (vga_video_type >= VIDEO_TYPE_VGAC)
554
-				vgacon_set_cursor_size(c->vc_x, 31, 30);
556
+				vgacon_set_cursor_size(c->state.x, 31, 30);
555
557
 			else
556
-				vgacon_set_cursor_size(c->vc_x, 31, 31);
558
+				vgacon_set_cursor_size(c->state.x, 31, 31);
557
559
 			break;
558
560
 		default:
559
-			vgacon_set_cursor_size(c->vc_x, 1,
561
+			vgacon_set_cursor_size(c->state.x, 1,
560
562
 					       c->vc_cell_height);
561
563
 			break;
562
564
 		}
..
..
@@ -1151,8 +1153,8 @@
1151
1153
 		 * console initialization routines.
1152
1154
 		 */
1153
1155
 		vga_bootup_console = 1;
1154
-		c->vc_x = screen_info.orig_x;
1155
-		c->vc_y = screen_info.orig_y;
1156
+		c->state.x = screen_info.orig_x;
1157
+		c->state.y = screen_info.orig_y;
1156
1158
 	}
1157
1159
 
1158
1160
 	/* We can't copy in more than the size of the video buffer,