aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubrata Banik <subratabanik@google.com>2023-10-15 17:33:59 +0530
committerSubrata Banik <subratabanik@google.com>2023-10-16 15:20:58 +0000
commit8da57ba0e7f356d3b599190ff5423cf6eed01c64 (patch)
treea77b9b279a2c5fb66a278cb9311b48bef92a06e4
parent045251e4515686ffeff0fa0521cf90eaf32b4d7f (diff)
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 <subratabanik@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78383 Reviewed-by: Eric Lai <ericllai@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/common/block/graphics/graphics.c31
1 files changed, 25 insertions, 6 deletions
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 5b2484a45f..9d541d0208 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -31,6 +31,14 @@ intel_igd_get_controller_info(const struct device *device)
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 @@ intel_igd_get_controller_info(const struct device *device)
*/
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;
+ }
}
}