Merge drm/drm-next into drm-intel-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / display / intel_display_core.h

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 54278db823dfd5a12cd627d7b870000012c68062..8853a05dc3318ccb3e31ff75617ab37e1c508efe 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -184,6 +184,9 @@ struct intel_hotplug {
        /* Whether or not to count short HPD IRQs in HPD storms */
        u8 hpd_short_storm_enabled;
 
+       /* Last state reported by oob_hotplug_event for each encoder */
+       unsigned long oob_hotplug_last_state;
+
        /*
         * if we get a HPD irq from DP and a HPD irq from non-DP
         * the non-DP HPD could block the workqueue on a mode config