drm/amd/display: Pass override OUI in to dc_init_data

[WHY]
Vendor dongle requires propietary OUI and handshake sequence.

[HOW]
Add a new structure to dc_init_data, to allow creator to pass
an override vendor_oui. This value will be written to DP_SOURCE_OUI
instead of AMD signature, when dpcd_set_source_specific_data is
called.

Signed-off-by: Calvin Hou <Calvin.Hou@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 40878b86a05d95b17453a6f1c0fbd06aa0eb1b31..7513aa71da38fd5aba9f6aa67668f58d373ca41d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -701,7 +701,7 @@ static bool dc_construct(struct dc *dc,
                dc_ctx->created_bios = true;
        }
 
-
+       dc->vendor_signature = init_params->vendor_signature;
 
        /* Create GPIO service */
        dc_ctx->gpio_service = dal_gpio_service_create(

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index c5b45d17e8cde43d70530eb9f20841813bc8dfef..3bc05fa93ed5b94688fcab7bbea2627b14f33eea 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -4179,25 +4179,32 @@ void dp_set_fec_enable(struct dc_link *link, bool enable)
 
 void dpcd_set_source_specific_data(struct dc_link *link)
 {
-       struct dpcd_amd_signature amd_signature;
        const uint32_t post_oui_delay = 30; // 30ms
 
-       amd_signature.AMD_IEEE_TxSignature_byte1 = 0x0;
-       amd_signature.AMD_IEEE_TxSignature_byte2 = 0x0;
-       amd_signature.AMD_IEEE_TxSignature_byte3 = 0x1A;
-       amd_signature.device_id_byte1 =
-                       (uint8_t)(link->ctx->asic_id.chip_id);
-       amd_signature.device_id_byte2 =
-                       (uint8_t)(link->ctx->asic_id.chip_id >> 8);
-       memset(&amd_signature.zero, 0, 4);
-       amd_signature.dce_version =
-                       (uint8_t)(link->ctx->dce_version);
-       amd_signature.dal_version_byte1 = 0x0; // needed? where to get?
-       amd_signature.dal_version_byte2 = 0x0; // needed? where to get?
-
-       core_link_write_dpcd(link, DP_SOURCE_OUI,
-                       (uint8_t *)(&amd_signature),
-                       sizeof(amd_signature));
+       if (!link->dc->vendor_signature.is_valid) {
+               struct dpcd_amd_signature amd_signature;
+               amd_signature.AMD_IEEE_TxSignature_byte1 = 0x0;
+               amd_signature.AMD_IEEE_TxSignature_byte2 = 0x0;
+               amd_signature.AMD_IEEE_TxSignature_byte3 = 0x1A;
+               amd_signature.device_id_byte1 =
+                               (uint8_t)(link->ctx->asic_id.chip_id);
+               amd_signature.device_id_byte2 =
+                               (uint8_t)(link->ctx->asic_id.chip_id >> 8);
+               memset(&amd_signature.zero, 0, 4);
+               amd_signature.dce_version =
+                               (uint8_t)(link->ctx->dce_version);
+               amd_signature.dal_version_byte1 = 0x0; // needed? where to get?
+               amd_signature.dal_version_byte2 = 0x0; // needed? where to get?
+
+               core_link_write_dpcd(link, DP_SOURCE_OUI,
+                               (uint8_t *)(&amd_signature),
+                               sizeof(amd_signature));
+
+       } else {
+               core_link_write_dpcd(link, DP_SOURCE_OUI,
+                               link->dc->vendor_signature.data.raw,
+                               sizeof(link->dc->vendor_signature.data.raw));
+       }
 
        // Sink may need to configure internals based on vendor, so allow some
        // time before proceeding with possibly vendor specific transactions

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 6e2e5e24daaf1592af5b46183eb5538b679d277e..8c88706040a76db8b52712d94a92c13bf380528f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -527,6 +527,7 @@ struct dc {
        struct compressor *fbc_compressor;
 
        struct dc_debug_data debug_data;
+       struct dpcd_vendor_signature vendor_signature;
 
        const char *build_id;
        struct vm_helper *vm_helper;
@@ -573,6 +574,7 @@ struct dc_init_data {
         * available in FW
         */
        const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box;
+       struct dpcd_vendor_signature vendor_signature;
 };
 
 struct dc_callback_init {

diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
index f762f35f529d2249f382868566230b488e99ecb6..bb2730e9521ed3320f8de0ee8239cdad97f53445 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
@@ -432,6 +432,20 @@ struct dp_sink_hw_fw_revision {
        uint8_t ieee_fw_rev[2];
 };
 
+struct dpcd_vendor_signature {
+       bool is_valid;
+
+       union dpcd_ieee_vendor_signature {
+               struct {
+                       uint8_t ieee_oui[3];/*24-bit IEEE OUI*/
+                       uint8_t ieee_device_id[6];/*usually 6-byte ASCII name*/
+                       uint8_t ieee_hw_rev;
+                       uint8_t ieee_fw_rev[2];
+               };
+               uint8_t raw[12];
+       } data;
+};
+
 struct dpcd_amd_signature {
        uint8_t AMD_IEEE_TxSignature_byte1;
        uint8_t AMD_IEEE_TxSignature_byte2;