We can parse edid caps from drm_edid and drm_eld and any calls of
dm_helpers_parse_edid_caps is made in a state that we have drm_edid set
to amdgpu connector.
v5: also remove the parameter from kernel-doc (kernel test bot)
Signed-off-by: Melissa Wen <mwen@xxxxxxxxxx>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +--
.../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 32 ++++++++-----------
drivers/gpu/drm/amd/display/dc/dm_helpers.h | 1 -
.../drm/amd/display/dc/link/link_detection.c | 6 ++--
4 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a710d0576edd..e75d7e58df16 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7030,10 +7030,7 @@ static void amdgpu_dm_connector_funcs_force(struct drm_connector *connector)
memset(&dc_em_sink->edid_caps, 0, sizeof(struct dc_edid_caps));
memmove(dc_em_sink->dc_edid.raw_edid, edid,
(edid->extensions + 1) * EDID_LENGTH);
- dm_helpers_parse_edid_caps(
- dc_link,
- &dc_em_sink->dc_edid,
- &dc_em_sink->edid_caps);
+ dm_helpers_parse_edid_caps(dc_link, &dc_em_sink->edid_caps);
}
}
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 e785b1e3277b..87b19c50ee55 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
@@ -82,32 +82,24 @@ static void apply_edid_quirks(struct drm_edid_product_id *product_id, struct dc_
* dm_helpers_parse_edid_caps() - Parse edid caps
*
* @link: current detected link
- * @edid: [in] pointer to edid
* @edid_caps: [in] pointer to edid caps
*
* Return: void
*/
-enum dc_edid_status dm_helpers_parse_edid_caps(
- struct dc_link *link,
- const struct dc_edid *edid,
- struct dc_edid_caps *edid_caps)
+enum dc_edid_status dm_helpers_parse_edid_caps(struct dc_link *link,
+ struct dc_edid_caps *edid_caps)
{
struct amdgpu_dm_connector *aconnector = link->priv;
struct drm_connector *connector = &aconnector->base;
const struct drm_edid *drm_edid = aconnector->drm_edid;
struct drm_edid_product_id product_id;
- struct edid *edid_buf = edid ? (struct edid *) edid->raw_edid : NULL;
int sad_count;
int i = 0;
-
enum dc_edid_status result = EDID_OK;
- if (!edid_caps || !edid)
+ if (!edid_caps || !drm_edid)
return EDID_BAD_INPUT;
- if (!drm_edid_is_valid(edid_buf))
- result = EDID_BAD_CHECKSUM;
-
drm_edid_get_product_id(drm_edid, &product_id);
edid_caps->manufacturer_id = le16_to_cpu(product_id.manufacturer_name);
@@ -919,19 +911,23 @@ enum dc_edid_status dm_helpers_read_local_edid(
if (!drm_edid)
return EDID_NO_RESPONSE;
- edid = drm_edid_raw(drm_edid); // FIXME: Get rid of drm_edid_raw()
+ /* FIXME: Get rid of drm_edid_raw()
+ * Raw edid is still needed for dm_helpers_dp_write_dpcd()
+ */
+ edid = drm_edid_raw(drm_edid);
sink->dc_edid.length = EDID_LENGTH * (edid->extensions + 1);
memmove(sink->dc_edid.raw_edid, (uint8_t *)edid, sink->dc_edid.length);
edid_status = dm_helpers_parse_edid_caps(
link,
- &sink->dc_edid,
&sink->edid_caps);
- /* We don't need the original edid anymore */
- drm_edid_free(drm_edid);
-
- } while (edid_status == EDID_BAD_CHECKSUM && --retry > 0);
+ if (edid_status != EDID_OK) {
+ /* We can discard the drm_edid and retry */
+ drm_edid_free(drm_edid);
+ drm_edid_connector_update(connector, drm_edid);
+ }
+ } while (edid_status != EDID_OK && --retry > 0);
if (edid_status != EDID_OK)
DRM_ERROR("EDID err: %d, on connector: %s",
@@ -1294,4 +1290,4 @@ bool dm_helpers_is_hdr_on(struct dc_context *ctx, struct dc_stream_state *stream
{
// TODO
return false;
-}
\ No newline at end of file
+}
diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
index 2e4a46f1b499..4e1776b5f0d4 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
@@ -61,7 +61,6 @@ void dm_helpers_free_gpu_mem(
enum dc_edid_status dm_helpers_parse_edid_caps(
struct dc_link *link,
- const struct dc_edid *edid,
struct dc_edid_caps *edid_caps);
diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
index 391dbe81534d..5fdd3e7da54e 100644
--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
@@ -1414,10 +1414,8 @@ struct dc_sink *link_add_remote_sink(
dc_sink))
goto fail_add_sink;
- edid_status = dm_helpers_parse_edid_caps(
- link,
- &dc_sink->dc_edid,
- &dc_sink->edid_caps);
+ edid_status = dm_helpers_parse_edid_caps(link,
+ &dc_sink->edid_caps);
/*
* Treat device as no EDID device if EDID
--
2.43.0
