[PATCH v2 02/39] drm/bridge: switch to drm_bridge_read_edid()

[Jani Nikula]

On Wed, 03 Jan 2024, Thomas Zimmermann <tzimmermann at suse.de> wrote:
> Hi Jani
>
>  > drm/bridge: switch to drm_bridge_read_edid()
>
> Did you mean drm_bridge_edid_read(), here and in the other patches?

Ah, yeah, I did.

> (Personally, I'd prefer read_edid over edid_read. The former is common 
> style and easier to read.)

The name comes from drm_edid_read() family of functions, which are so
named because they reside in drm_edid.[ch].

BR,
Jani.

>
> Best regards
> Thomas
>
> Am 03.01.24 um 11:08 schrieb Jani Nikula:
>> Prefer using the struct drm_edid based functions.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>   drivers/gpu/drm/drm_bridge_connector.c | 16 ++++++++--------
>>   1 file changed, 8 insertions(+), 8 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c
>> index 3acd67021ec6..982552c9f92c 100644
>> --- a/drivers/gpu/drm/drm_bridge_connector.c
>> +++ b/drivers/gpu/drm/drm_bridge_connector.c
>> @@ -239,27 +239,27 @@ static int drm_bridge_connector_get_modes_edid(struct drm_connector *connector,
>>   					       struct drm_bridge *bridge)
>>   {
>>   	enum drm_connector_status status;
>> -	struct edid *edid;
>> +	const struct drm_edid *drm_edid;
>>   	int n;
>>   
>>   	status = drm_bridge_connector_detect(connector, false);
>>   	if (status != connector_status_connected)
>>   		goto no_edid;
>>   
>> -	edid = drm_bridge_get_edid(bridge, connector);
>> -	if (!drm_edid_is_valid(edid)) {
>> -		kfree(edid);
>> +	drm_edid = drm_bridge_edid_read(bridge, connector);
>> +	if (!drm_edid_valid(drm_edid)) {
>> +		drm_edid_free(drm_edid);
>>   		goto no_edid;
>>   	}
>>   
>> -	drm_connector_update_edid_property(connector, edid);
>> -	n = drm_add_edid_modes(connector, edid);
>> +	drm_edid_connector_update(connector, drm_edid);
>> +	n = drm_edid_connector_add_modes(connector);
>>   
>> -	kfree(edid);
>> +	drm_edid_free(drm_edid);
>>   	return n;
>>   
>>   no_edid:
>> -	drm_connector_update_edid_property(connector, NULL);
>> +	drm_edid_connector_update(connector, NULL);
>>   	return 0;
>>   }
>>   

-- 
Jani Nikula, Intel