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 <jeremy.compostella@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72125
Reviewed-by: Tarun Tuli <taruntuli@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
diff --git a/src/drivers/intel/gma/gma-gfx_init.ads b/src/drivers/intel/gma/gma-gfx_init.ads
index fc45672..88f64d9 100644
--- a/src/drivers/intel/gma/gma-gfx_init.ads
+++ b/src/drivers/intel/gma/gma-gfx_init.ads
@@ -11,7 +11,7 @@
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 420dc6e..ae0b0b7 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 @@
package body GMA.GFX_Init
is
+ configs : Pipe_Configs;
----------------------------------------------------------------------------
procedure gfxinit (lightup_ok : out Interfaces.C.int)
@@ -28,7 +29,6 @@
use type Interfaces.C.size_t;
ports : Port_List;
- configs : Pipe_Configs;
success : boolean;
@@ -97,16 +97,14 @@
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 3270b91..24079c3 100644
--- a/src/drivers/intel/gma/libgfxinit.h
+++ b/src/drivers/intel/gma/libgfxinit.h
@@ -17,7 +17,7 @@
};
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 cec21b5..912b1b6 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 @@
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 @@
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/soc/intel/common/block/graphics/early_graphics.c b/src/soc/intel/common/block/graphics/early_graphics.c
index 3ae7697..8157a4c 100644
--- a/src/soc/intel/common/block/graphics/early_graphics.c
+++ b/src/soc/intel/common/block/graphics/early_graphics.c
@@ -6,8 +6,6 @@
#include <intelblocks/early_graphics.h>
#include <soc/pci_devs.h>
-static bool initialized;
-
static void device_init(void)
{
/* Disable response in IO and MMIO space. */
@@ -37,19 +35,15 @@
early_graphics_soc_panel_init();
gma_gfxinit(&ret);
- initialized = !!ret;
-
- return initialized;
+ return !!ret;
}
void early_graphics_stop(void)
{
- int ret;
-
- if (!initialized)
+ if (!CONFIG(MAINBOARD_USE_EARLY_LIBGFXINIT))
return;
- gma_gfxstop(&ret);
+ gma_gfxstop();
/*
* Temporary workaround