4 files changed, 16 insertions, 20 deletions
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;