[PATCH v3 08/14] drm/amd/display: simplify dm_helpers_parse_edid_caps signature

[Melissa Wen]

On 14/05/2025 17:19, Melissa Wen wrote:
> Pass dc_sink to dm_helpers_parse_edid_caps(), since it already contains
> edid info. It's a groundwork to get rid of raw edid stored as dc_edid.
>
> Signed-off-by: Melissa Wen <mwen at igalia.com>
> ---
>   .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  5 +----
>   .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c  | 18 +++++++-----------
>   drivers/gpu/drm/amd/display/dc/dm_helpers.h    |  7 ++-----
>   .../drm/amd/display/dc/link/link_detection.c   |  5 +----
>   4 files changed, 11 insertions(+), 24 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 6a85d0ea20dc..0650866dfb6d 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -7384,10 +7384,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);
>   	}
>   }
>   
> 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 e7cfbee6c67f..6e42b610cdea 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
> @@ -95,23 +95,22 @@ static void apply_edid_quirks(struct drm_device *dev,
>    *
>    * Return: void
>    */
Ugh.. I forgot to update the kernel-doc for dm_helpers_parse_edid_caps().
But I'll wait a bit for comments before sending a another version with 
this fix.

Melissa
> -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_sink *sink)
>   {
>   	struct amdgpu_dm_connector *aconnector = link->priv;
>   	struct drm_connector *connector = &aconnector->base;
>   	struct drm_device *dev = connector->dev;
> -	struct edid *edid_buf = edid ? (struct edid *) edid->raw_edid : NULL;
> +	struct edid *edid_buf;
>   	const struct drm_edid *drm_edid;
>   	struct drm_edid_product_id product_id;
> +	struct dc_edid_caps *edid_caps = &sink->edid_caps;
>   	int sad_count;
>   	int i = 0;
>   	enum dc_edid_status result = EDID_OK;
>   
> -
> -	if (!edid_caps || !edid)
> +	edid_buf = (struct edid *) &sink->dc_edid.raw_edid;
> +	if (!edid_caps || !edid_buf)
>   		return EDID_BAD_INPUT;
>   
>   	drm_edid = drm_edid_alloc(edid_buf, EDID_LENGTH * (edid_buf->extensions + 1));
> @@ -1030,10 +1029,7 @@ enum dc_edid_status dm_helpers_read_local_edid(
>   		/* We don't need the original edid anymore */
>   		drm_edid_free(drm_edid);
>   
> -		edid_status = dm_helpers_parse_edid_caps(
> -						link,
> -						&sink->dc_edid,
> -						&sink->edid_caps);
> +		edid_status = dm_helpers_parse_edid_caps(link, sink);
>   
>   	} while (edid_status == EDID_BAD_CHECKSUM && --retry > 0);
>   
> diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
> index 9d160b39e8c5..ce6a70368bd0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h
> +++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
> @@ -59,11 +59,8 @@ void dm_helpers_free_gpu_mem(
>   		enum dc_gpu_mem_alloc_type type,
>   		void *pvMem);
>   
> -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_sink *sink);
>   
>   /*
>    * Update DP branch info
> 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 cc9191a5c9e6..8c7a00c1ad2b 100644
> --- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
> +++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
> @@ -1429,10 +1429,7 @@ 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);
>   
>   	/*
>   	 * Treat device as no EDID device if EDID