From b628beca3428731b6ea43218caa27bdaf8eb651d Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Thu, 19 Jan 2023 18:58:30 -0700 Subject: drivers/intel/gma: Use libgfxinit Update_Output to turn off graphics We were using the libgfxinit `Initialize' function with the `Clean_State' parameter because the more appropriate `Update_Output' function was not performing all the necessary clean up operations for the PEIM driver to be successful when libgfxinit was used in romstage. Thanks to a lot of experiments and some log analysis efforts, we were able to identify the missing operation and fix the `Update_Output' function (cf. https://review.coreboot.org/c/libgfxinit/+/72123). The `initialized' global variable is now unnecessary as we track the initialization in the Ada code instead. Since the `Update_Output' function does not return any value, this patch modifies the `gma_gfxstop' prototype accordingly. This does not have any impact as the return value was not used anyway. BUG=b:264526798 BRANCH=firmware-brya-14505.B TEST=Developer screen is visible Change-Id: I53d6fadf65dc09bd984de96edb4c1f15b64aeed0 Signed-off-by: Jeremy Compostella Reviewed-on: https://review.coreboot.org/c/coreboot/+/72125 Reviewed-by: Tarun Tuli Tested-by: build bot (Jenkins) Reviewed-by: Nick Vaccaro --- src/drivers/intel/gma/gma-gfx_init.ads | 2 +- src/drivers/intel/gma/hires_fb/gma-gfx_init.adb | 16 +++++++--------- src/drivers/intel/gma/libgfxinit.h | 2 +- src/drivers/intel/gma/text_fb/gma-gfx_init.adb | 16 +++++++--------- 4 files changed, 16 insertions(+), 20 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/intel/gma/gma-gfx_init.ads b/src/drivers/intel/gma/gma-gfx_init.ads index fc45672ee0..88f64d9ffe 100644 --- a/src/drivers/intel/gma/gma-gfx_init.ads +++ b/src/drivers/intel/gma/gma-gfx_init.ads @@ -11,7 +11,7 @@ is procedure gfxinit (lightup_ok : out Interfaces.C.int); pragma Export (C, gfxinit, "gma_gfxinit"); - procedure gfxstop (stop_ok : out Interfaces.C.int); + procedure gfxstop; pragma Export (C, gfxstop, "gma_gfxstop"); ---------------------------------------------------------------------------- diff --git a/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb b/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb index 420dc6e7d1..ae0b0b7ba5 100644 --- a/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb +++ b/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb @@ -18,6 +18,7 @@ with GMA.Mainboard; package body GMA.GFX_Init is + configs : Pipe_Configs; ---------------------------------------------------------------------------- procedure gfxinit (lightup_ok : out Interfaces.C.int) @@ -28,7 +29,6 @@ is use type Interfaces.C.size_t; ports : Port_List; - configs : Pipe_Configs; success : boolean; @@ -97,16 +97,14 @@ is end if; end gfxinit; - procedure gfxstop (stop_ok : out Interfaces.C.int) + procedure gfxstop is - success : boolean; begin - HW.GFX.GMA.Initialize (Clean_State => True, - Success => success); - if success then - stop_ok := 1; - else - stop_ok := 0; + if configs (Primary).Port /= Disabled then + for i in Pipe_Index loop + configs (i).Port := Disabled; + end loop; + HW.GFX.GMA.Update_Outputs (configs); end if; end gfxstop; diff --git a/src/drivers/intel/gma/libgfxinit.h b/src/drivers/intel/gma/libgfxinit.h index 3270b91752..24079c31ff 100644 --- a/src/drivers/intel/gma/libgfxinit.h +++ b/src/drivers/intel/gma/libgfxinit.h @@ -17,7 +17,7 @@ enum { }; void gma_gfxinit(int *lightup_ok); -void gma_gfxstop(int *stop_ok); +void gma_gfxstop(void); int gma_read_edid(unsigned char edid[], int port); #endif diff --git a/src/drivers/intel/gma/text_fb/gma-gfx_init.adb b/src/drivers/intel/gma/text_fb/gma-gfx_init.adb index cec21b5310..912b1b605c 100644 --- a/src/drivers/intel/gma/text_fb/gma-gfx_init.adb +++ b/src/drivers/intel/gma/text_fb/gma-gfx_init.adb @@ -12,11 +12,11 @@ with GMA.Mainboard; package body GMA.GFX_Init is + configs : Pipe_Configs; procedure gfxinit (lightup_ok : out Interfaces.C.int) is ports : Port_List; - configs : Pipe_Configs; success : boolean; @@ -56,16 +56,14 @@ is end if; end gfxinit; - procedure gfxstop (stop_ok : out Interfaces.C.int) + procedure gfxstop is - success : boolean; begin - HW.GFX.GMA.Initialize (Clean_State => True, - Success => success); - if success then - stop_ok := 1; - else - stop_ok := 0; + if configs (Primary).Port /= Disabled then + for i in Pipe_Index loop + configs (i).Port := Disabled; + end loop; + HW.GFX.GMA.Update_Outputs (configs); end if; end gfxstop; -- cgit v1.2.3