Skip to content

Commit

Permalink
drm/amd/display: assign edid_blob_ptr with edid from debugfs
Browse files Browse the repository at this point in the history
[Why] implementation change of drm_edid_override_set since linux
kernel 6.1, edid from debugfs is saved into connector->edid_override
immediatey, not saved to connector->edid_blob_ptr at the same time.

[How] call new drm_edid function drm_connector_update_edid_property
to assign connector->edid_blob_ptr with override edid from debugfs.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Chao-kai Wang <Stylon.Wang@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Hersen Wu authored and Alex Deucher committed Apr 24, 2023
1 parent 1ba91b5 commit 550e5d2
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -6373,11 +6373,20 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector)
struct edid *edid;

if (!aconnector->base.edid_blob_ptr) {
DRM_ERROR("No EDID firmware found on connector: %s ,forcing to OFF!\n",
aconnector->base.name);
/* if connector->edid_override valid, pass
* it to edid_override to edid_blob_ptr
*/
int count;

aconnector->base.force = DRM_FORCE_OFF;
return;
count = drm_edid_override_connector_update(&aconnector->base);

if (!aconnector->base.edid_blob_ptr) {
DRM_ERROR("No EDID firmware found on connector: %s ,forcing to OFF!\n",
aconnector->base.name);

aconnector->base.force = DRM_FORCE_OFF;
return;
}
}

edid = (struct edid *) aconnector->base.edid_blob_ptr->data;
Expand Down

0 comments on commit 550e5d2

Please sign in to comment.