From: Alex Deucher <alexander.deucher@xxxxxxx> commit 979bfe291b5b30a9132c2fd433247e677b24c6aa upstream. This reverts commit 949658cb9b69ab9d22a42a662b2fdc7085689ed8. This causes a blank screen on boot. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3696 Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: Shixiong Ou <oushixiong@xxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/radeon/radeon_connectors.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index f9c73c55f04f..f9996304d943 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1255,16 +1255,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) goto exit; } } - - if (dret && radeon_connector->hpd.hpd != RADEON_HPD_NONE && - !radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) && - connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) { - DRM_DEBUG_KMS("EDID is readable when HPD disconnected\n"); - schedule_delayed_work(&rdev->hotplug_work, msecs_to_jiffies(1000)); - ret = connector_status_disconnected; - goto exit; - } - if (dret) { radeon_connector->detected_by_load = false; radeon_connector_free_edid(connector); -- 2.47.1 Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-6.12/drm-amdgpu-fix-usage-slab-after-free.patch queue-6.12/drm-amd-pm-disable-pcie-speed-switching-on-intel-platform-for-smu-v14.0.2-3.patch queue-6.12/drm-amdgpu-pm-add-gen5-display-to-the-user-on-smu-v14.0.2-3.patch queue-6.12/drm-amd-fix-initialization-mistake-for-nbio-7.11-devices.patch queue-6.12/revert-drm-radeon-delay-connector-detecting-when-hpd-singals-is-unstable.patch queue-6.12/drm-amd-add-some-missing-straps-from-nbio-7.11.0.patch queue-6.12/drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch queue-6.12/drm-amd-display-remove-pipe_dto_src_sel-programming-from-set_dtbclk_dto.patch queue-6.12/drm-amd-pm-remove-arcturus-min-power-limit.patch queue-6.12/drm-amd-display-update-pipe-selection-policy-to-check-head-pipe.patch queue-6.12/drm-amdkfd-use-the-correct-wptr-size.patch queue-6.12/drm-amd-pm-skip-setting-the-power-source-on-smu-v14.0.2-3.patch queue-6.12/drm-amd-display-fix-handling-of-plane-refcount.patch
