Merge tag 'drm-misc-next-2022-06-17' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dp / dp_parser.c

diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c
index 6088d70..57ae14a 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_parser.c
+++ b/drivers/gpu/drm/msm/dp/dp_parser.c
@@ -258,12 +258,10 @@ static int dp_parser_clock(struct dp_parser *parser)
                }
        }
 
-       DRM_DEBUG_DP("clock parsing successful\n");
-
        return 0;
 }
 
-static int dp_parser_find_next_bridge(struct dp_parser *parser)
+int dp_parser_find_next_bridge(struct dp_parser *parser)
 {
        struct device *dev = &parser->pdev->dev;
        struct drm_bridge *bridge;
@@ -277,7 +275,7 @@ static int dp_parser_find_next_bridge(struct dp_parser *parser)
        return 0;
 }
 
-static int dp_parser_parse(struct dp_parser *parser, int connector_type)
+static int dp_parser_parse(struct dp_parser *parser)
 {
        int rc = 0;
 
@@ -298,25 +296,6 @@ static int dp_parser_parse(struct dp_parser *parser, int connector_type)
        if (rc)
                return rc;
 
-       /*
-        * External bridges are mandatory for eDP interfaces: one has to
-        * provide at least an eDP panel (which gets wrapped into panel-bridge).
-        *
-        * For DisplayPort interfaces external bridges are optional, so
-        * silently ignore an error if one is not present (-ENODEV).
-        */
-       rc = dp_parser_find_next_bridge(parser);
-       if (rc == -ENODEV) {
-               if (connector_type == DRM_MODE_CONNECTOR_eDP) {
-                       DRM_ERROR("eDP: next bridge is not present\n");
-                       return rc;
-               }
-       } else if (rc) {
-               if (rc != -EPROBE_DEFER)
-                       DRM_ERROR("DP: error parsing next bridge: %d\n", rc);
-               return rc;
-       }
-
        /* Map the corresponding regulator information according to
         * version. Currently, since we only have one supported platform,
         * mapping the regulator directly.