drm/amd/display: remove SIGNAL_TYPE_WIRELESS

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
index 61f36a7f322b2f15ba398bf93d669feee869705a..c4eddee8de1bbdffab2dba56975f8d79ca584bf3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
@@ -44,7 +44,6 @@ static const struct dc_signal_type_info signal_type_info_tbl[] = {
                {SIGNAL_TYPE_DISPLAY_PORT,     "DP"},
                {SIGNAL_TYPE_DISPLAY_PORT_MST, "MST"},
                {SIGNAL_TYPE_EDP,              "eDP"},
-               {SIGNAL_TYPE_WIRELESS,         "Wireless"},
                {SIGNAL_TYPE_VIRTUAL,          "Virtual"}
 };
 

diff --git a/drivers/gpu/drm/amd/display/dc/basics/signal_types.c b/drivers/gpu/drm/amd/display/dc/basics/signal_types.c
index 247487c3db71986a1a2ae0d0f8ab30b75b353e33..534c803e7091048907b326fa978187f90ba1fd17 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/basics/signal_types.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/signal_types.c
@@ -75,7 +75,6 @@ bool dc_is_audio_capable_signal(enum signal_type signal)
 {
        return (signal == SIGNAL_TYPE_DISPLAY_PORT ||
                signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||
-               dc_is_hdmi_signal(signal) ||
-               signal == SIGNAL_TYPE_WIRELESS);
+               dc_is_hdmi_signal(signal));
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 62cfc5cbe773acabaf0254dbce7163ce58c3dce7..f4f46d4f0cf0f61f709e48eae3eef12f9e56b9de 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1051,9 +1051,6 @@ static bool construct(
                if (link->device_tag.dev_id.device_type == DEVICE_TYPE_LCD
                        && link->public.connector_signal == SIGNAL_TYPE_RGB)
                        continue;
-               if (link->device_tag.dev_id.device_type == DEVICE_TYPE_WIRELESS
-                       && link->public.connector_signal != SIGNAL_TYPE_WIRELESS)
-                       continue;
                break;
        }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 930ae1377ab6c2930699f5f63870217cff5d1ec3..e9d1a54bffd3b52e2eba6e84b17191917428f7c2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
@@ -941,7 +941,6 @@ bool dce110_link_encoder_construct(
 
        enc110->base.hpd_source = init_data->hpd_source;
        enc110->base.connector = init_data->connector;
-       enc110->base.input_signals = SIGNAL_TYPE_ALL;
 
        enc110->base.preferred_engine = ENGINE_ID_UNKNOWN;
 

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
index 49c4b6587456b28fb69f068236ceff4dfef4e1b4..ac4010b9c638a8e33438849274bf0e2c8e19e83f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
@@ -186,7 +186,6 @@ struct link_encoder {
        struct dc_context *ctx;
        struct graphics_object_id id;
        struct graphics_object_id connector;
-       uint32_t input_signals;
        uint32_t output_signals;
        enum engine_id preferred_engine;
        struct encoder_feature_support features;

diff --git a/drivers/gpu/drm/amd/display/include/signal_types.h b/drivers/gpu/drm/amd/display/include/signal_types.h
index d87f84a56fcc6674d8fd5c836df2239ff1c92d84..1a2ca53c68cd2ee280129d245ac3f2fd19c3fcc2 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/signal_types.h
+++ b/drivers/gpu/drm/amd/display/include/signal_types.h
@@ -36,11 +36,7 @@ enum signal_type {
        SIGNAL_TYPE_DISPLAY_PORT        = (1 << 5),
        SIGNAL_TYPE_DISPLAY_PORT_MST    = (1 << 6),
        SIGNAL_TYPE_EDP                 = (1 << 7),
-       SIGNAL_TYPE_WIRELESS            = (1 << 8),     /* Wireless Display */
        SIGNAL_TYPE_VIRTUAL             = (1 << 9),     /* Virtual Display */
-
-       SIGNAL_TYPE_COUNT               = 10,
-       SIGNAL_TYPE_ALL                 = (1 << SIGNAL_TYPE_COUNT) - 1
 };
 
 /* help functions for signal types manipulation */