2020-03-19 19:30:11

by Arvind Sankar

[permalink] [raw]
Subject: [PATCH 07/14] efi/gop: Use helper macros for populating lfb_base

Use the lower/upper_32_bits macros from kernel.h to initialize
si->lfb_base and si->ext_lfb_base.

Signed-off-by: Arvind Sankar <[email protected]>
---
drivers/firmware/efi/libstub/gop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c
index 0d195060a370..7b0baf9a912f 100644
--- a/drivers/firmware/efi/libstub/gop.c
+++ b/drivers/firmware/efi/libstub/gop.c
@@ -158,8 +158,8 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
si->lfb_height = info->vertical_resolution;

fb_base = efi_table_attr(mode, frame_buffer_base);
- si->lfb_base = fb_base;
- si->ext_lfb_base = (u64)(unsigned long)fb_base >> 32;
+ si->lfb_base = lower_32_bits(fb_base);
+ si->ext_lfb_base = upper_32_bits(fb_base);
if (si->ext_lfb_base)
si->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;

--
2.24.1