erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/intel/gma: Fix mismatching types for fb_add_framebuffer_info

Browse source 
GCC LTO found this.

Change-Id: I2d5a9a86dbb91a5505891a30c6e9072b1b4dfc92
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84056
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2024-08-23 11:24:21 +02:00 • committed by Felix Held
commit 070561a295
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/drivers/intel/gma/gma-gfx_init.ads
View file

@ -16,14 +16,14 @@ is
----------------------------------------------------------------------------
function c_fb_add_framebuffer_info
function C_Fb_Add_Framebuffer_Info_Simple
(fb_addr: Interfaces.C.size_t;
x_resolution : word32;
y_resolution : word32;
bytes_per_line : word32;
bits_per_pixel : word8)
return Interfaces.C.size_t;
return Interfaces.C.int;
pragma import (C, c_fb_add_framebuffer_info, "fb_add_framebuffer_info");
pragma import (C, C_Fb_Add_Framebuffer_Info_Simple, "fb_add_framebuffer_info_simple");
end GMA.GFX_Init;

5
src/drivers/intel/gma/hires_fb/gma-gfx_init.adb
View file

@ -27,6 +27,7 @@ is
use type word64;
use type word32;
use type Interfaces.C.size_t;
use type Interfaces.C.int;
ports : Port_List;
@ -39,7 +40,7 @@ is
min_h : pos32 := Config.LINEAR_FRAMEBUFFER_MAX_WIDTH;
min_v : pos32 := Config.LINEAR_FRAMEBUFFER_MAX_HEIGHT;
fbinfo : Interfaces.C.size_t;
fbinfo : Interfaces.C.int;
begin
lightup_ok := 0;
@ -82,7 +83,7 @@ is
HW.GFX.GMA.Map_Linear_FB (linear_fb_addr, fb);
if linear_fb_addr /= 0 then
fbinfo := c_fb_add_framebuffer_info
fbinfo := C_Fb_Add_Framebuffer_Info_Simple
(fb_addr => Interfaces.C.size_t (linear_fb_addr),
x_resolution => word32 (fb.Width),
y_resolution => word32 (fb.Height),

2
src/include/framebuffer_info.h
View file

@ -14,6 +14,8 @@ fb_add_framebuffer_info_ex(const struct lb_framebuffer *fb);
struct fb_info *fb_add_framebuffer_info(uintptr_t fb_addr, uint32_t x_resolution,
uint32_t y_resolution, uint32_t bytes_per_line,
uint8_t bits_per_pixel);
int fb_add_framebuffer_info_simple(uintptr_t fb_addr, uint32_t x_res, uint32_t y_res,
uint32_t bytes_per_line, uint8_t bits_per_pixel);
void fb_set_orientation(struct fb_info *info,
enum lb_fb_orientation orientation);

7
src/lib/edid_fill_fb.c
View file

@ -148,6 +148,13 @@ fb_add_framebuffer_info(uintptr_t fb_addr, uint32_t x_resolution,
return info;
}
/* Wrapper for Ada to have a simpler function signature */
int fb_add_framebuffer_info_simple(uintptr_t fb_addr, uint32_t x_res, uint32_t y_res,
uint32_t bytes_per_line, uint8_t bits_per_pixel)
{
return fb_add_framebuffer_info(fb_addr, x_res, y_res, bytes_per_line, bits_per_pixel) != NULL;
}
void fb_set_orientation(struct fb_info *info, enum lb_fb_orientation orientation)
{
if (!info)