This reverts commit 550e5d23f14784e2a625c25fe0c9d498589c9256.
drm_edid_override_connector_update() is *not* supposed to be used by
drivers directly.
>From the documentation:
Only to be used from drm_helper_probe_single_connector_modes() as a
fallback for when DDC probe failed during drm_get_edid() and caused
the override/firmware EDID to be skipped.
It's impossible to unify firmare and override EDID handling and property
updates if drivers mess with this directly.
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>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 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 3e132438bc13..c7c1260b7b6e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6370,20 +6370,11 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector)
struct edid *edid;
if (!aconnector->base.edid_blob_ptr) {
- /* if connector->edid_override valid, pass
- * it to edid_override to edid_blob_ptr
- */
- int count;
-
- 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);
+ DRM_ERROR("No EDID firmware found on connector: %s ,forcing to OFF!\n",
+ aconnector->base.name);
- aconnector->base.force = DRM_FORCE_OFF;
- return;
- }
+ aconnector->base.force = DRM_FORCE_OFF;
+ return;
}
edid = (struct edid *) aconnector->base.edid_blob_ptr->data;
--
2.39.2
