Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d9b263528e01bfbaf716b51f38606b3dfe5ac1e9

Authored by Matthew Garrett
Committed by H. Peter Anvin
1 parent 156171c71a
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

x86, setup: Store the boot cursor state 

Add a field to store the boot cursor state and implement this for VGA on
x86. This can then be used to set the default policy for the boot console.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
LKML-Reference: <1258142222-16092-1-git-send-email-mjg@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

Showing 2 changed files with 10 additions and 1 deletions Side-by-side Diff

arch/x86/boot/video.c
Diff comments   View file @ d9b2635
... ... @@ -27,6 +27,12 @@
27 27  
28 28 boot_params.screen_info.orig_x = oreg.dl;
29 29 boot_params.screen_info.orig_y = oreg.dh;
  30 +
  31 + if (oreg.ch & 0x20)
  32 + boot_params.screen_info.flags |= VIDEO_FLAGS_NOCURSOR;
  33 +
  34 + if ((oreg.ch & 0x1f) > (oreg.cl & 0x1f))
  35 + boot_params.screen_info.flags |= VIDEO_FLAGS_NOCURSOR;
30 36 }
31 37  
32 38 static void store_video_mode(void)
include/linux/screen_info.h
Diff comments   View file @ d9b2635
... ... @@ -14,7 +14,8 @@
14 14 __u16 orig_video_page; /* 0x04 */
15 15 __u8 orig_video_mode; /* 0x06 */
16 16 __u8 orig_video_cols; /* 0x07 */
17   - __u16 unused2; /* 0x08 */
  17 + __u8 flags; /* 0x08 */
  18 + __u8 unused2; /* 0x09 */
18 19 __u16 orig_video_ega_bx;/* 0x0a */
19 20 __u16 unused3; /* 0x0c */
20 21 __u8 orig_video_lines; /* 0x0e */
... ... @@ -64,6 +65,8 @@
64 65 #define VIDEO_TYPE_PMAC 0x60 /* PowerMacintosh frame buffer. */
65 66  
66 67 #define VIDEO_TYPE_EFI 0x70 /* EFI graphic mode */
  68 +
  69 +#define VIDEO_FLAGS_NOCURSOR (1 << 0) /* The video mode has no cursor set */
67 70  
68 71 #ifdef __KERNEL__
69 72 extern struct screen_info screen_info;