drm/amd/display: [FW Promotion] Release 0.0.115.0

- Add new cmd for querying HPD state

Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index e24f117e831ec02998558a72596a302bcf86567b..385c28238beb17dfc33bf3e846df226c97443730 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -350,7 +350,7 @@ union dmub_fw_boot_options {
                uint32_t power_optimization: 1;
                uint32_t diag_env: 1; /* 1 if diagnostic environment */
                uint32_t gpint_scratch8: 1; /* 1 if GPINT is in scratch8*/
-               uint32_t usb4_cm_version: 1; /**< USB4 CM Version */
+               uint32_t usb4_cm_version: 1; /**< 1 CM support */
 
                uint32_t reserved : 17; /**< reserved */
        } bits; /**< boot bits */
@@ -654,6 +654,10 @@ enum dmub_cmd_type {
         * Command type used for getting usbc cable ID
         */
        DMUB_CMD_GET_USBC_CABLE_ID = 81,
+       /**
+        * Command type used to query HPD state.
+        */
+       DMUB_CMD__QUERY_HPD_STATE = 82,
        /**
         * Command type used for all VBIOS interface commands.
         */
@@ -1353,6 +1357,30 @@ struct dmub_rb_cmd_dp_set_config_reply {
        struct set_config_reply_control_data set_config_reply_control;
 };
 
+/**
+ * Data passed from driver to FW in a DMUB_CMD__QUERY_HPD_STATE command.
+ */
+struct dmub_cmd_hpd_state_query_data {
+       uint8_t instance; /**< HPD instance or DPIA instance */
+       uint8_t result; /**< For returning HPD state */
+       enum aux_channel_type ch_type; /**< enum aux_channel_type */
+       enum aux_return_code_type status; /**< for returning the status of command */
+};
+
+/**
+ * Definition of a DMUB_CMD__QUERY_HPD_STATE command.
+ */
+struct dmub_rb_cmd_query_hpd_state {
+       /**
+        * Command header.
+        */
+       struct dmub_cmd_header header;
+       /**
+        * Data passed from driver to FW in a DMUB_CMD__QUERY_HPD_STATE command.
+        */
+       struct dmub_cmd_hpd_state_query_data data;
+};
+
 /*
  * Command IDs should be treated as stable ABI.
  * Do not reuse or modify IDs.
@@ -2757,6 +2785,11 @@ union dmub_rb_cmd {
         * Definition of a DMUB_CMD_GET_USBC_CABLE_ID command.
         */
        struct dmub_rb_cmd_get_usbc_cable_id cable_id;
+
+       /**
+        * Definition of a DMUB_CMD__QUERY_HPD_STATE command.
+        */
+       struct dmub_rb_cmd_query_hpd_state query_hpd;
 };
 
 /**