Attachment #566386 for bug #677574

View | Details | Raw Unified | Return to bug 677574
Collapse All | Expand All

Lines 306-311 grub_linux_setup_video (struct linux_kernel_params *params) Link Here

(-)a/grub-core/loader/i386/linux.c (+6 lines)
306	params->lfb_line_len = mode_info.pitch;	306	params->lfb_line_len = mode_info.pitch;
307		307
308	params->lfb_base = (grub_size_t) framebuffer;	308	params->lfb_base = (grub_size_t) framebuffer;
		309
		310	#if defined (GRUB_MACHINE_EFI) && defined (__x86_64__)
		311	params->ext_lfb_base = (grub_size_t) (((grub_uint64_t)(grub_size_t) framebuffer) >> 32);
		312	params->capabilities \|= VIDEO_CAPABILITY_64BIT_BASE;
		313	#endif
		314
309	params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536);	315	params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536);
310		316
311	params->red_mask_size = mode_info.red_mask_size;	317	params->red_mask_size = mode_info.red_mask_size;

Lines 43-48 Link Here

(-)a/include/grub/i386/linux.h (-2 / +5 lines)
43		43
44	#define GRUB_LINUX_CL_MAGIC 0xA33F	44	#define GRUB_LINUX_CL_MAGIC 0xA33F
45		45
		46	#define VIDEO_CAPABILITY_SKIP_QUIRKS (1 << 0)
		47	#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit. */
		48
46	#ifdef __x86_64__	49	#ifdef __x86_64__
47		50
48	#define GRUB_LINUX_EFI_SIGNATURE \	51	#define GRUB_LINUX_EFI_SIGNATURE \
Lines 188-195 struct linux_kernel_params Link Here
188	grub_uint16_t lfb_pages; /* 32 */	191	grub_uint16_t lfb_pages; /* 32 */
189	grub_uint16_t vesa_attrib; /* 34 */	192	grub_uint16_t vesa_attrib; /* 34 */
190	grub_uint32_t capabilities; /* 36 */	193	grub_uint32_t capabilities; /* 36 */
		194	grub_uint32_t ext_lfb_base; /* 3a */
191		195
192	grub_uint8_t padding3[0x40 - 0x3a];	196	grub_uint8_t padding3[0x40 - 0x3e];
193		197
194	grub_uint16_t apm_version; /* 40 */	198	grub_uint16_t apm_version; /* 40 */
195	grub_uint16_t apm_code_segment; /* 42 */	199	grub_uint16_t apm_code_segment; /* 42 */
196	-

Return to bug 677574