[PATCH 1/4] Revert "drm/amd/display: drop unused count variable in create_eml_sink()"

Jani Nikula jani.nikula at intel.com
Tue Aug 22 12:01:37 UTC 2023


This reverts commit 8789989b476b5f3bb0bf1a63b5223f6e76cfd13d.

Dependency for reverting the next commit cleanly.

Cc: Alex Deucher <alexander.deucher at amd.com>
Cc: Alex Hung <alex.hung at amd.com>
Cc: Chao-kai Wang <Stylon.Wang at amd.com>
Cc: Daniel Wheeler <daniel.wheeler at amd.com>
Cc: Harry Wentland <harry.wentland at amd.com>
Cc: Hersen Wu <hersenxs.wu at amd.com>
Cc: Leo Li <sunpeng.li at amd.com>
Cc: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>
Cc: Wenchieh Chien <wenchieh.chien at amd.com>
Cc: David Airlie <airlied at gmail.com>
Cc: Daniel Vetter <daniel at ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula at 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



More information about the amd-gfx mailing list