OpenCoreUefiInOut: Removed DirectGopCacheMode due to being ineffective

dimaoc2012 · May 13, 2020 · 15fdaf6 · 15fdaf6
1 parent 86a49fb
commit 15fdaf6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 36 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -24,6 +24,7 @@ OpenCore Changelog
 - Fixed CPU detection crash with QEMU 5.0 and KVM accelerator
 - Removed `RequestBootVarFallback` due to numerous bugs
 - Added `DeduplicateBootOrder` UEFI quirk
+- Removed `DirectGopCacheMode` due to being ineffective
 
 #### v0.5.8
 - Fixed invalid CPU object reference in SSDT-PLUG

diff --git a/Docs/Configuration.tex b/Docs/Configuration.tex
@@ -4849,21 +4849,6 @@ \subsection{Output Properties}\label{uefioutputprops}
 
   \emph{Note}: This option only applies to \texttt{System} renderer.
 
-\item
-  \texttt{DirectGopCacheMode}\\
-  \textbf{Type}: \texttt{plist\ string}\\
-  \textbf{Failsafe}: Empty string\\
-  \textbf{Description}: Cache mode for builtin graphics output protocol framebuffer.
-
-  Tuning cache mode may provide better rendering performance on some firmwares.
-  Providing empty string leaves cache control settings to the firmware.
-  Valid non-empty values are: \texttt{Uncacheable}, \texttt{WriteCombining}, and
-  \texttt{WriteThrough}.
-
-  \emph{Note}: This option is not supported on most hardware (see
-  \href{https://github.com/acidanthera/bugtracker/issues/755}{acidanthera/bugtracker\#755}
-  for more details).
-
 \item
   \texttt{DirectGopRendering}\\
   \textbf{Type}: \texttt{plist\ boolean}\\

diff --git a/Docs/Sample.plist b/Docs/Sample.plist
@@ -860,8 +860,6 @@
 			<false/>
 			<key>ConsoleMode</key>
 			<string></string>
-			<key>DirectGopCacheMode</key>
-			<string></string>
 			<key>DirectGopRendering</key>
 			<false/>
 			<key>IgnoreTextInGraphics</key>

diff --git a/Docs/SampleFull.plist b/Docs/SampleFull.plist
@@ -963,8 +963,6 @@
 			<false/>
 			<key>ConsoleMode</key>
 			<string></string>
-			<key>DirectGopCacheMode</key>
-			<string></string>
 			<key>DirectGopRendering</key>
 			<false/>
 			<key>IgnoreTextInGraphics</key>

diff --git a/Include/Library/OcConfigurationLib.h b/Include/Library/OcConfigurationLib.h
@@ -517,7 +517,6 @@ typedef enum {
   _(OC_STRING                   , ConsoleMode                 ,     , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
   _(OC_STRING                   , Resolution                  ,     , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
   _(OC_STRING                   , TextRenderer                ,     , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
-  _(OC_STRING                   , DirectGopCacheMode          ,     , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
   _(BOOLEAN                     , IgnoreTextInGraphics        ,     , FALSE  , ()) \
   _(BOOLEAN                     , ClearScreenOnModeSwitch     ,     , FALSE  , ()) \
   _(BOOLEAN                     , ProvideConsoleGop           ,     , FALSE  , ()) \

diff --git a/Library/OcConfigurationLib/OcConfigurationLib.c b/Library/OcConfigurationLib/OcConfigurationLib.c
@@ -601,7 +601,6 @@ OC_SCHEMA
 mUefiOutputSchema[] = {
   OC_SCHEMA_BOOLEAN_IN ("ClearScreenOnModeSwitch",OC_GLOBAL_CONFIG, Uefi.Output.ClearScreenOnModeSwitch),
   OC_SCHEMA_STRING_IN  ("ConsoleMode",            OC_GLOBAL_CONFIG, Uefi.Output.ConsoleMode),
-  OC_SCHEMA_STRING_IN  ("DirectGopCacheMode",     OC_GLOBAL_CONFIG, Uefi.Output.DirectGopCacheMode),
   OC_SCHEMA_BOOLEAN_IN ("DirectGopRendering",     OC_GLOBAL_CONFIG, Uefi.Output.DirectGopRendering),
   OC_SCHEMA_BOOLEAN_IN ("IgnoreTextInGraphics",   OC_GLOBAL_CONFIG, Uefi.Output.IgnoreTextInGraphics),
   OC_SCHEMA_BOOLEAN_IN ("ProvideConsoleGop",      OC_GLOBAL_CONFIG, Uefi.Output.ProvideConsoleGop),

diff --git a/Platform/OpenCore/OpenCoreUefiInOut.c b/Platform/OpenCore/OpenCoreUefiInOut.c
@@ -191,7 +191,6 @@ OcLoadUefiOutputSupport (
 {
   EFI_STATUS           Status;
   CONST CHAR8          *AsciiRenderer;
-  CONST CHAR8          *AsciiCacheMode;
   OC_CONSOLE_RENDERER  Renderer;
   UINT32               Width;
   UINT32               Height;
@@ -241,20 +240,7 @@ OcLoadUefiOutputSupport (
   }
 
   if (Config->Uefi.Output.DirectGopRendering) {
-    AsciiCacheMode = OC_BLOB_GET (&Config->Uefi.Output.DirectGopCacheMode);
-
-    if (AsciiCacheMode[0] == '\0') {
-      OcUseDirectGop (-1);
-    } else if (AsciiStrCmp (AsciiCacheMode, "Uncacheable") == 0) {
-      OcUseDirectGop (CacheUncacheable);
-    } else if (AsciiStrCmp (AsciiCacheMode, "WriteCombining") == 0) {
-      OcUseDirectGop (CacheWriteCombining);
-    } else if (AsciiStrCmp (AsciiCacheMode, "WriteThrough") == 0) {
-      OcUseDirectGop (CacheWriteThrough);
-    } else {
-      DEBUG ((DEBUG_WARN, "OC: Requested unknown cache mode %a\n", AsciiCacheMode));
-      OcUseDirectGop (-1);
-    }
+    OcUseDirectGop (-1);
   }
 
   if (Config->Uefi.Output.ReconnectOnResChange && !EFI_ERROR (Status)) {