[PATCH v4 02/14] drm/amd/display: start using drm_edid helpers to parse EDID caps

[Melissa Wen]

Groundwork that allocates a temporary drm_edid from raw edid to take
advantage of DRM common-code helpers instead of driver-specific code.

Signed-off-by: Melissa Wen <m...@igalia.com>
---
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index d4395b92fb85..5543780f1024 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -108,18 +108,21 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
        struct drm_connector *connector = &aconnector->base;
        struct drm_device *dev = connector->dev;
        struct edid *edid_buf = edid ? (struct edid *) edid->raw_edid : NULL;
+       const struct drm_edid *drm_edid;
        struct cea_sad *sads;
        int sad_count = -1;
        int sadb_count = -1;
        int i = 0;
        uint8_t *sadb = NULL;
-
        enum dc_edid_status result = EDID_OK;
 
+
        if (!edid_caps || !edid)
                return EDID_BAD_INPUT;
 
-       if (!drm_edid_is_valid(edid_buf))
+       drm_edid = drm_edid_alloc(edid_buf, EDID_LENGTH * (edid_buf->extensions 
+ 1));
+
+       if (!drm_edid_valid(drm_edid))
                result = EDID_BAD_CHECKSUM;
 
        edid_caps->manufacturer_id = (uint16_t) edid_buf->mfg_id[0] |
@@ -139,8 +142,10 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
        apply_edid_quirks(dev, edid_buf, edid_caps);
 
        sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads);
-       if (sad_count <= 0)
+       if (sad_count <= 0) {
+               drm_edid_free(drm_edid);
                return result;
+       }
 
        edid_caps->audio_mode_count = min(sad_count, DC_MAX_AUDIO_DESC_COUNT);
        for (i = 0; i < edid_caps->audio_mode_count; ++i) {
@@ -166,6 +171,7 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
 
        kfree(sads);
        kfree(sadb);
+       drm_edid_free(drm_edid);
 
        return result;
 }
-- 
2.47.2