drm/i915: Disable hotplug detection handlers during driver init/shutdown

As described in the previous two patches an unexpected connector
detection can happen during the init/shutdown sequences. Prevent these
by returning the connector's current status from the detection handlers.

Link: https://patchwork.freedesktop.org/patch/msgid/20240104083008.2715733-10-imre.deak@intel.com
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index b330337b842a46c4ea688922d063273d1ca4f021..b9733a73e21d4357e5716ccc06522fb7ce84eebd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -42,6 +42,7 @@
 #include "intel_ddi.h"
 #include "intel_ddi_buf_trans.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_fdi.h"
 #include "intel_fdi_regs.h"
@@ -846,6 +847,9 @@ intel_crt_detect(struct drm_connector *connector,
        if (!intel_display_device_enabled(dev_priv))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(dev_priv))
+               return connector->status;
+
        if (dev_priv->display.params.load_detect_test) {
                wakeref = intel_display_power_get(dev_priv,
                                                  intel_encoder->power_domain);

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 6ce003b97dcce0d9e16942fc6559977eea61268f..b2591148670b7683ba3557562b37adc1e9235f94 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -56,6 +56,7 @@
 #include "intel_cx0_phy.h"
 #include "intel_ddi.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_dp.h"
 #include "intel_dp_aux.h"
@@ -5646,6 +5647,9 @@ intel_dp_detect(struct drm_connector *connector,
        if (!intel_display_device_enabled(dev_priv))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(dev_priv))
+               return connector->status;
+
        /* Can't disconnect eDP */
        if (intel_dp_is_edp(intel_dp))
                status = edp_detect(intel_dp);
@@ -5746,6 +5750,10 @@ intel_dp_force(struct drm_connector *connector)
 
        drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
                    connector->base.id, connector->name);
+
+       if (!intel_display_driver_check_access(dev_priv))
+               return;
+
        intel_dp_unset_edid(intel_dp);
 
        if (connector->status != connector_status_connected)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 8a9432335030346ecf3b7501a4cfb19cd59d5259..5fa25a5a36b5532282f9e42037c089a2dd4ebeb6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -37,6 +37,7 @@
 #include "intel_crtc.h"
 #include "intel_ddi.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_dp.h"
 #include "intel_dp_hdcp.h"
@@ -1410,6 +1411,9 @@ intel_dp_mst_detect(struct drm_connector *connector,
        if (drm_connector_is_unregistered(connector))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(i915))
+               return connector->status;
+
        return drm_dp_mst_detect_port(connector, ctx, &intel_dp->mst_mgr,
                                      intel_connector->port);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
index 83898ba493d1622dacbe5b6931d6ad743c40316e..8ca9ae4798a8940f8f79473b3030bcb345e716e9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -35,6 +35,7 @@
 #include "i915_reg.h"
 #include "intel_connector.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_dvo.h"
 #include "intel_dvo_dev.h"
@@ -328,6 +329,9 @@ intel_dvo_detect(struct drm_connector *_connector, bool force)
        if (!intel_display_device_enabled(i915))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(i915))
+               return connector->base.status;
+
        return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 55048c56bc527c5aa9ab727ee249422dba68838d..7020e58061092bd919af3b53486181b3300afb9a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -49,6 +49,7 @@
 #include "intel_cx0_phy.h"
 #include "intel_ddi.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_dp.h"
 #include "intel_gmbus.h"
@@ -2505,6 +2506,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
        if (!intel_display_device_enabled(dev_priv))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(dev_priv))
+               return connector->status;
+
        wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
        if (DISPLAY_VER(dev_priv) >= 11 &&
@@ -2533,6 +2537,9 @@ intel_hdmi_force(struct drm_connector *connector)
        drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n",
                    connector->base.id, connector->name);
 
+       if (!intel_display_driver_check_access(i915))
+               return;
+
        intel_hdmi_unset_edid(connector);
 
        if (connector->status != connector_status_connected)

diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
index 0d8e5320a4f88e2526b832b3c9d2659956136832..073ea3166c360f4a8f63dc6175095093d576b7ab 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_panel.c
+++ b/drivers/gpu/drm/i915/display/intel_panel.c
@@ -37,6 +37,7 @@
 #include "intel_backlight.h"
 #include "intel_connector.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_drrs.h"
 #include "intel_lvds_regs.h"
@@ -683,6 +684,9 @@ intel_panel_detect(struct drm_connector *connector, bool force)
        if (!intel_display_device_enabled(i915))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(i915))
+               return connector->status;
+
        return connector_status_connected;
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index c660dd88dec707cc847d63cb157f28791d08eff6..cea909046ccd2da1ee3b85bd95b9353ef983aa71 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -43,6 +43,7 @@
 #include "intel_connector.h"
 #include "intel_crtc.h"
 #include "intel_de.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_fdi.h"
 #include "intel_fifo_underrun.h"
@@ -2139,6 +2140,9 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
        if (!intel_display_device_enabled(i915))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(i915))
+               return connector->status;
+
        if (!intel_sdvo_set_target_output(intel_sdvo,
                                          intel_sdvo_connector->output_flag))
                return connector_status_unknown;

diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index 1b19443739c3327186d626d9826d8b316cbb4c46..a96bcfcf90a3d3191297740e9c98981eb180574a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -40,6 +40,7 @@
 #include "intel_crtc.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_dpll.h"
 #include "intel_hotplug.h"
@@ -1723,6 +1724,9 @@ intel_tv_detect(struct drm_connector *connector,
        if (!intel_display_device_enabled(i915))
                return connector_status_disconnected;
 
+       if (!intel_display_driver_check_access(i915))
+               return connector->status;
+
        if (force) {
                struct drm_atomic_state *state;