This reverts commit 8789989b476b5f3bb0bf1a63b5223f6e76cfd13d. Dependency for reverting the next commit cleanly. Cc: Alex Deucher <alexander.deucher@xxxxxxx> Cc: Alex Hung <alex.hung@xxxxxxx> Cc: Chao-kai Wang <Stylon.Wang@xxxxxxx> Cc: Daniel Wheeler <daniel.wheeler@xxxxxxx> Cc: Harry Wentland <harry.wentland@xxxxxxx> Cc: Hersen Wu <hersenxs.wu@xxxxxxx> Cc: Leo Li <sunpeng.li@xxxxxxx> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx> Cc: Wenchieh Chien <wenchieh.chien@xxxxxxx> Cc: David Airlie <airlied@xxxxxxxxx> Cc: Daniel Vetter <daniel@xxxxxxxx> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 268cb99a4c4b..3e132438bc13 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6373,8 +6373,9 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector) /* if connector->edid_override valid, pass * it to edid_override to edid_blob_ptr */ + int count; - drm_edid_override_connector_update(&aconnector->base); + 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", -- 2.39.2