This reverts commit 8789989b476b5f3bb0bf1a63b5223f6e76cfd13d. Dependency for reverting the next commit cleanly.
Cc: Alex Deucher <alexander.deuc...@amd.com> Cc: Alex Hung <alex.h...@amd.com> Cc: Chao-kai Wang <stylon.w...@amd.com> Cc: Daniel Wheeler <daniel.whee...@amd.com> Cc: Harry Wentland <harry.wentl...@amd.com> Cc: Hersen Wu <hersenxs...@amd.com> Cc: Leo Li <sunpeng...@amd.com> Cc: Rodrigo Siqueira <rodrigo.sique...@amd.com> Cc: Wenchieh Chien <wenchieh.ch...@amd.com> Cc: David Airlie <airl...@gmail.com> Cc: Daniel Vetter <dan...@ffwll.ch> Signed-off-by: Jani Nikula <jani.nik...@intel.com> --- 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