1 files changed, 8 insertions, 1 deletions
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 3f720ac380..2c66a44ad0 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -1350,6 +1350,7 @@ DevNullTextOutSetMode (
 --*/
 {
   UINTN                         Size;
+  INT32                         CurrentMode;
   UINTN                         Row;
   UINTN                         Column;
   TEXT_OUT_SPLITTER_QUERY_DATA  *Mode;
@@ -1357,8 +1358,14 @@ DevNullTextOutSetMode (
   //
   // No extra check for ModeNumber here, as it has been checked in
   // ConSplitterTextOutSetMode. And mode 0 should always be supported.
+  // Row and Column should be fetched from intersection map.
   //
-  Mode    = &(Private->TextOutQueryData[ModeNumber]);
+  if (Private->TextOutModeMap != NULL) {
+    CurrentMode = *(Private->TextOutModeMap + Private->TextOutListCount * ModeNumber);
+  } else {
+    CurrentMode = (INT32)(ModeNumber);
+  }
+  Mode    = &(Private->TextOutQueryData[CurrentMode]);
   Row     = Mode->Rows;
   Column  = Mode->Columns;