summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/intel/fsp1_1/fsp_gop.c11
-rw-r--r--src/drivers/intel/fsp2_0/graphics.c13
-rw-r--r--src/drivers/intel/gma/gma.ads7
-rw-r--r--src/drivers/intel/gma/hires_fb/gma.adb52
-rw-r--r--src/drivers/intel/gma/text_fb/gma.adb13
-rw-r--r--src/drivers/xgi/common/xgi_coreboot.c7
6 files changed, 51 insertions, 52 deletions
diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c
index 28ed06d763..dd190145e1 100644
--- a/src/drivers/intel/fsp1_1/fsp_gop.c
+++ b/src/drivers/intel/fsp1_1/fsp_gop.c
@@ -57,11 +57,8 @@ const optionrom_vbt_t *fsp_get_vbt(uint32_t *vbt_len)
return vbt.data;
}
-void lb_framebuffer(struct lb_header *header)
+int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{
- struct lb_framebuffer *framebuffer;
- framebuffer = (struct lb_framebuffer *)lb_new_record(header);
-
VOID *hob_list_ptr;
hob_list_ptr = get_hob_list();
const EFI_GUID vbt_guid = EFI_PEI_GRAPHICS_INFO_HOB_GUID;
@@ -70,7 +67,7 @@ void lb_framebuffer(struct lb_header *header)
vbt_hob = get_next_guid_hob(&vbt_guid, hob_list_ptr);
if (vbt_hob == NULL) {
printk(BIOS_ERR, "FSP_ERR: Graphics Data HOB is not present\n");
- return;
+ return -1;
}
printk(BIOS_DEBUG, "FSP_DEBUG: Graphics Data HOB present\n");
vbt_gop = GET_GUID_HOB_DATA(vbt_hob);
@@ -89,6 +86,6 @@ void lb_framebuffer(struct lb_header *header)
framebuffer->blue_mask_size = 8;
framebuffer->reserved_mask_pos = 24;
framebuffer->reserved_mask_size = 8;
- framebuffer->tag = LB_TAG_FRAMEBUFFER;
- framebuffer->size = sizeof(*framebuffer);
+
+ return 0;
}
diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c
index 97fffdc290..cfd3d16428 100644
--- a/src/drivers/intel/fsp2_0/graphics.c
+++ b/src/drivers/intel/fsp2_0/graphics.c
@@ -88,8 +88,7 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
framebuffer->blue_mask_size = fbinfo->blue.size;
framebuffer->reserved_mask_pos = fbinfo->rsvd.pos;
framebuffer->reserved_mask_size = fbinfo->rsvd.pos;
- framebuffer->tag = LB_TAG_FRAMEBUFFER;
- framebuffer->size = sizeof(*framebuffer);
+
return CB_SUCCESS;
}
@@ -104,10 +103,9 @@ uintptr_t fsp_load_vbt(void)
return (uintptr_t)vbt;
}
-void lb_framebuffer(struct lb_header *header)
+int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{
enum cb_err ret;
- struct lb_framebuffer *framebuffer;
uintptr_t framebuffer_bar;
/* Pci enumeration happens after silicon init.
@@ -118,20 +116,21 @@ void lb_framebuffer(struct lb_header *header)
if (!framebuffer_bar) {
printk(BIOS_ALERT, "Framebuffer BAR invalid\n");
- return;
+ return -1;
}
- framebuffer = (void *)lb_new_record(header);
ret = fsp_fill_lb_framebuffer(framebuffer);
if (ret != CB_SUCCESS) {
printk(BIOS_ALERT, "FSP did not return a valid framebuffer\n");
- return;
+ return -1;
}
/* Resource allocator can move the BAR around after FSP configures it */
framebuffer->physical_address = framebuffer_bar;
printk(BIOS_DEBUG, "Graphics framebuffer located at 0x%llx\n",
framebuffer->physical_address);
+
+ return 0;
}
__attribute__((weak)) uintptr_t fsp_soc_get_igd_bar(void)
diff --git a/src/drivers/intel/gma/gma.ads b/src/drivers/intel/gma/gma.ads
index d912df1635..157ec89fcc 100644
--- a/src/drivers/intel/gma/gma.ads
+++ b/src/drivers/intel/gma/gma.ads
@@ -15,9 +15,6 @@ is
----------------------------------------------------------------------------
- function vbe_mode_info_valid return Interfaces.C.int;
- pragma Export (C, vbe_mode_info_valid, "vbe_mode_info_valid");
-
type lb_framebuffer is record
tag : word32;
size : word32;
@@ -37,7 +34,9 @@ is
reserved_mask_size : word8;
end record;
- procedure fill_lb_framebuffer (framebuffer : out lb_framebuffer);
+ function fill_lb_framebuffer
+ (framebuffer : in out lb_framebuffer)
+ return Interfaces.C.int;
pragma Export (C, fill_lb_framebuffer, "fill_lb_framebuffer");
end GMA;
diff --git a/src/drivers/intel/gma/hires_fb/gma.adb b/src/drivers/intel/gma/hires_fb/gma.adb
index 0ee4a73212..7fe4e1200d 100644
--- a/src/drivers/intel/gma/hires_fb/gma.adb
+++ b/src/drivers/intel/gma/hires_fb/gma.adb
@@ -12,38 +12,40 @@ with GMA.Mainboard;
package body GMA
is
- vbe_valid : boolean := false;
+ fb_valid : boolean := false;
linear_fb_addr : word64;
fb : Framebuffer_Type;
- function vbe_mode_info_valid return Interfaces.C.int
- is
- begin
- return (if vbe_valid then 1 else 0);
- end vbe_mode_info_valid;
-
- procedure fill_lb_framebuffer (framebuffer : out lb_framebuffer)
+ function fill_lb_framebuffer
+ (framebuffer : in out lb_framebuffer)
+ return Interfaces.C.int
is
use type word32;
+ use type Interfaces.C.int;
begin
- framebuffer :=
- (tag => 0,
- size => 0,
- physical_address => linear_fb_addr,
- x_resolution => word32 (fb.Width),
- y_resolution => word32 (fb.Height),
- bytes_per_line => 4 * word32 (fb.Stride),
- bits_per_pixel => 32,
- reserved_mask_pos => 24,
- reserved_mask_size => 8,
- red_mask_pos => 16,
- red_mask_size => 8,
- green_mask_pos => 8,
- green_mask_size => 8,
- blue_mask_pos => 0,
- blue_mask_size => 8);
+ if fb_valid then
+ framebuffer :=
+ (tag => 0,
+ size => 0,
+ physical_address => linear_fb_addr,
+ x_resolution => word32 (fb.Width),
+ y_resolution => word32 (fb.Height),
+ bytes_per_line => 4 * word32 (fb.Stride),
+ bits_per_pixel => 32,
+ reserved_mask_pos => 24,
+ reserved_mask_size => 8,
+ red_mask_pos => 16,
+ red_mask_size => 8,
+ green_mask_pos => 8,
+ green_mask_size => 8,
+ blue_mask_pos => 0,
+ blue_mask_size => 8);
+ return 0;
+ else
+ return -1;
+ end if;
end fill_lb_framebuffer;
----------------------------------------------------------------------------
@@ -102,7 +104,7 @@ is
HW.GFX.GMA.Update_Outputs (configs);
linear_fb_addr := linear_fb;
- vbe_valid := true;
+ fb_valid := true;
lightup_ok := 1;
end if;
diff --git a/src/drivers/intel/gma/text_fb/gma.adb b/src/drivers/intel/gma/text_fb/gma.adb
index 5df203b580..6453571d8c 100644
--- a/src/drivers/intel/gma/text_fb/gma.adb
+++ b/src/drivers/intel/gma/text_fb/gma.adb
@@ -11,16 +11,13 @@ with GMA.Mainboard;
package body GMA
is
- function vbe_mode_info_valid return Interfaces.C.int
+ function fill_lb_framebuffer
+ (framebuffer : in out lb_framebuffer)
+ return Interfaces.C.int
is
+ use type Interfaces.C.int;
begin
- return 0;
- end vbe_mode_info_valid;
-
- procedure fill_lb_framebuffer (framebuffer : out lb_framebuffer)
- is
- begin
- null;
+ return -1;
end fill_lb_framebuffer;
----------------------------------------------------------------------------
diff --git a/src/drivers/xgi/common/xgi_coreboot.c b/src/drivers/xgi/common/xgi_coreboot.c
index e78c7bba9d..4db06f9b6d 100644
--- a/src/drivers/xgi/common/xgi_coreboot.c
+++ b/src/drivers/xgi/common/xgi_coreboot.c
@@ -426,9 +426,14 @@ int vbe_mode_info_valid(void)
return xgi_vbe_valid;
}
-void fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
+int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{
+ if (!vbe_mode_info_valid())
+ return -1;
+
*framebuffer = xgi_fb;
+
+ return 0;
}
struct xgifb_video_info *xgifb_video_info_ptr;