drm/edid: Move validate_displayid() drm_find_displayid_extension()

Instead of everyone having to call validate_displayid() let's just
have drm_find_displayid_extension() do it for them.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200313162054.16009-6-ville.syrjala@linux.intel.com
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d783c5f958b3baab483a857507a5a5fd42194d87..2b8e22cc14074eedebb37a5d7bafc2fe2607ab5f 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3216,6 +3216,7 @@ static u8 *drm_find_displayid_extension(const struct edid *edid,
                                        int *length, int *idx)
 {
        u8 *displayid = drm_find_edid_extension(edid, DISPLAYID_EXT);
+       int ret;
 
        if (!displayid)
                return NULL;
@@ -3223,12 +3224,15 @@ static u8 *drm_find_displayid_extension(const struct edid *edid,
        *length = EDID_LENGTH;
        *idx = 1;
 
+       ret = validate_displayid(displayid, *length, *idx);
+       if (ret)
+               return NULL;
+
        return displayid;
 }
 
 static u8 *drm_find_cea_extension(const struct edid *edid)
 {
-       int ret;
        int length, idx;
        struct displayid_block *block;
        u8 *cea;
@@ -3244,10 +3248,6 @@ static u8 *drm_find_cea_extension(const struct edid *edid)
        if (!displayid)
                return NULL;
 
-       ret = validate_displayid(displayid, length, idx);
-       if (ret)
-               return NULL;
-
        idx += sizeof(struct displayid_hdr);
        for_each_displayid_db(displayid, block, idx, length) {
                if (block->tag == DATA_BLOCK_CTA) {
@@ -5188,7 +5188,6 @@ static int add_displayid_detailed_modes(struct drm_connector *connector,
                                        struct edid *edid)
 {
        u8 *displayid;
-       int ret;
        int length, idx;
        struct displayid_block *block;
        int num_modes = 0;
@@ -5197,10 +5196,6 @@ static int add_displayid_detailed_modes(struct drm_connector *connector,
        if (!displayid)
                return 0;
 
-       ret = validate_displayid(displayid, length, idx);
-       if (ret)
-               return 0;
-
        idx += sizeof(struct displayid_hdr);
        for_each_displayid_db(displayid, block, idx, length) {
                switch (block->tag) {
@@ -5848,10 +5843,6 @@ static int drm_parse_display_id(struct drm_connector *connector,
        struct displayid_block *block;
        int ret;
 
-       ret = validate_displayid(displayid, length, idx);
-       if (ret)
-               return ret;
-
        idx += sizeof(struct displayid_hdr);
        for_each_displayid_db(displayid, block, idx, length) {
                DRM_DEBUG_KMS("block id 0x%x, rev %d, len %d\n",