Commit bab87ef4 authored by Imre Deak's avatar Imre Deak
Browse files

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: default avatarJouni Högander <jouni.hogander@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
parent cd572b3b

drivers/gpu/drm/i915/display/intel_crt.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/intel_dp.c

+8 −0
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/display/intel_dp_mst.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/display/intel_dvo.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/display/intel_hdmi.c

+7 −0
Original line number Diff line number Diff line
@@ -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)