From c3bad0c7e541776d16369d148f164879a72d022b Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Wed, 1 Jul 2020 21:00:01 +0300 Subject: drm/i915: Fix the old vs. new epoch counter check during hotplug detect The old epoch counter was left uninited, so the function returned a changed state always. While at it debug print the old epoch counter as well. Fixes: 35205ee9ba46 ("drm/i915: Send hotplug event if edid had changed") Cc: Kunal Joshi Cc: Stanislav Lisovskiy Cc: Maarten Lankhorst Signed-off-by: Imre Deak Reviewed-by: Stanislav Lisovskiy Link: https://patchwork.freedesktop.org/patch/msgid/20200701180001.15857-1-imre.deak@intel.com --- drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/i915/display/intel_hotplug.c') diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c index 126e03e637d7..252090ccecc4 100644 --- a/drivers/gpu/drm/i915/display/intel_hotplug.c +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c @@ -279,6 +279,7 @@ intel_encoder_hotplug(struct intel_encoder *encoder, drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex)); old_status = connector->base.status; + old_epoch_counter = connector->base.epoch_counter; connector->base.status = drm_helper_probe_detect(&connector->base, NULL, false); @@ -287,11 +288,12 @@ intel_encoder_hotplug(struct intel_encoder *encoder, ret = true; if (ret) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s(epoch counter %llu)\n", + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s (epoch counter %llu->%llu)\n", connector->base.base.id, connector->base.name, drm_get_connector_status_name(old_status), drm_get_connector_status_name(connector->base.status), + old_epoch_counter, connector->base.epoch_counter); return INTEL_HOTPLUG_CHANGED; } -- cgit v1.2.3-59-g8ed1b