[S] Change in coreboot[main]: soc/intel/cmn/gfx: Detect dual display (eDP + HDMI)

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/78383?usp=email )

Change subject: soc/intel/cmn/gfx: Detect dual display (eDP + HDMI)
......................................................................

soc/intel/cmn/gfx: Detect dual display (eDP + HDMI)

This patch adds support for detecting dual displays (eDP and HDMI) on
Intel platforms. This information is useful for setting the
`lb_framebuffer.has_external_display` variable, which is used to
determine whether depthchage should avoid shutting down when an
extended display is present.

TEST= Able to build and boot google/rex, where depthchage now
successfully avoids shutting down when both eDP and HDMI displays
are attached.

w/o this patch:
  with eDP and HDMI attached: .has_external_display=0
  with eDP attached: .has_external_display=0
  with HDMI attached: .has_external_display=1

w/ this patch:
  with eDP and HDMI attached: .has_external_display = 1
  with eDP attached: .has_external_display=0
  with HDMI attached: .has_external_display=1

Change-Id: Ie39d48da75a21e3508a1fbcf09da31caedaa1c0a
Signed-off-by: Subrata Banik 
---
M src/soc/intel/common/block/graphics/graphics.c
1 file changed, 25 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/78383/1

diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 5b2484a..9d541d0 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -31,6 +31,14 @@
    return NULL;
 }

+static uint32_t graphics_get_ddi_func_ctrl(unsigned long reg)
+{
+	uint32_t ddi_func_ctrl = graphics_gtt_read(reg);
+	ddi_func_ctrl &= TRANS_DDI_PORT_MASK;
+
+	return ddi_func_ctrl;
+}
+
 /*
  * Transcoders contain the timing generators for eDP, DP, and HDMI interfaces.
  * Intel transcoders are based on Quick Sync Video, which offloads video
@@ -58,20 +66,31 @@
  */
 static int get_external_display_status(void)
 {
-	uint32_t ddi_func_ctrl = graphics_gtt_read(TRANS_DDI_FUNC_CTL_A);
-	ddi_func_ctrl &= TRANS_DDI_PORT_MASK;
+	/* Read the transcoder register for DDI-A (eDP) */
+	uint32_t ddi_a_func_ctrl = graphics_get_ddi_func_ctrl(TRANS_DDI_FUNC_CTL_A);
+	/* Read the transcoder register for DDI-B (HDMI) */
+	uint32_t ddi_b_func_ctrl = graphics_get_ddi_func_ctrl(TRANS_DDI_FUNC_CTL_B);

/*
     * Check if transcoder is none or connected to DDI-A port (aka eDP).
     * Report no external display in both cases.
     */
-	if (ddi_func_ctrl == TRANS_DDI_PORT_NONE) {
+	if (ddi_a_func_ctrl == TRANS_DDI_PORT_NONE) {
    	return 0;
    } else {
-		if (ddi_func_ctrl == TRANS_DDI_SELECT_PORT(PORT_A))
-			return 0;
-		else
+		if ((ddi_a_func_ctrl == TRANS_DDI_SELECT_PORT(PORT_A)) &&
+			 (ddi_b_func_ctrl == TRANS_DDI_SELECT_PORT(PORT_B))) {
+			/*
+			 * Dual display detected: both DDI-A(eDP) and
+			 * DDI-B(HDMI) pipes are active
+			 */
    		return 1;
+		} else {
+			if (ddi_a_func_ctrl == TRANS_DDI_SELECT_PORT(PORT_A))
+				return 0;
+			else
+				return 1;
+		}
    }
 }