[PATCH 05/13] drm/amd/display: get SAD from drm_eld when parsing EDID caps

[Melissa Wen]

drm_edid_connector_update() updates display info, filling ELD with audio
info from Short-Audio Descriptors in the last step of
update_dislay_info(). Our goal is stopping using raw edid, so we can
extract SAD from drm_eld instead of access raw edid to get audio caps.

Signed-off-by: Melissa Wen <m...@igalia.com>
---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 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 620be159b8ef..ca9fe423e18e 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
@@ -104,11 +104,9 @@ 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;
-       struct drm_edid *drm_edid;
+       const struct drm_edid *drm_edid;
        struct drm_edid_product_id product_id;
-       struct cea_sad *sads;
-       int sad_count = -1;
-       int sadb_count = -1;
+       int sad_count, sadb_count;
        int i = 0;
        uint8_t *sadb = NULL;
 
@@ -117,9 +115,12 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
        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;
 
+       drm_edid_connector_update(connector, drm_edid);
        drm_edid_get_product_id(drm_edid, &product_id);
 
        edid_caps->manufacturer_id = le16_to_cpu(product_id.manufacturer_name);
@@ -137,18 +138,23 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
 
        apply_edid_quirks(dev, drm_edid, edid_caps);
 
-       sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads);
-       if (sad_count <= 0)
+       sad_count = drm_eld_sad_count(connector->eld);
+       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) {
-               struct cea_sad *sad = &sads[i];
+               struct cea_sad sad;
 
-               edid_caps->audio_modes[i].format_code = sad->format;
-               edid_caps->audio_modes[i].channel_count = sad->channels + 1;
-               edid_caps->audio_modes[i].sample_rate = sad->freq;
-               edid_caps->audio_modes[i].sample_size = sad->byte2;
+               if (drm_eld_sad_get(connector->eld, i, &sad) < 0)
+                       continue;
+
+               edid_caps->audio_modes[i].format_code = sad.format;
+               edid_caps->audio_modes[i].channel_count = sad.channels + 1;
+               edid_caps->audio_modes[i].sample_rate = sad.freq;
+               edid_caps->audio_modes[i].sample_size = sad.byte2;
        }
 
        sadb_count = drm_edid_to_speaker_allocation((struct edid *) 
edid->raw_edid, &sadb);
@@ -163,8 +169,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
        else
                edid_caps->speaker_flags = DEFAULT_SPEAKER_LOCATION;
 
-       kfree(sads);
        kfree(sadb);
+       drm_edid_free(drm_edid);
 
        return result;
 }
-- 
2.47.2