Commit b81dddb9 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Reduce INTEL_DISPLAY_ENABLED to just treat outputs as disconnected 



Since the display hardware is all there even when INTEL_DISPLAY_ENABLED
return false we have to be capable of shutting it down cleanly so
as to not anger the hw. To that end let's reduce the effect of
!INTEL_DISPLAY_ENABLE to just treating all outputs as disconnected.
Should prevent anyone from automagically enabling any of them, while
still allowing us to cleanly shut them down.

v2: Put the check into the right place for CRT

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200910164256.25983-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent da27bd41

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

+1 −0
Original line number Diff line number Diff line
@@ -1646,6 +1646,7 @@ static const struct drm_encoder_funcs gen11_dsi_encoder_funcs = { 
};



static const struct drm_connector_funcs gen11_dsi_connector_funcs = {

	.detect = intel_panel_detect,

	.late_register = intel_connector_register,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_connector_destroy,

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

+3 −0
Original line number Diff line number Diff line
@@ -833,6 +833,9 @@ intel_crt_detect(struct drm_connector *connector, 
		    connector->base.id, connector->name,

		    force);



	if (!INTEL_DISPLAY_ENABLED(dev_priv))

		return connector_status_disconnected;



	if (dev_priv->params.load_detect_test) {

		wakeref = intel_display_power_get(dev_priv,

						  intel_encoder->power_domain);

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

+1 −1
Original line number Diff line number Diff line
@@ -16893,7 +16893,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 








	intel_pps_init(dev_priv);

















	if (!HAS_DISPLAY(dev_priv) || !INTEL_DISPLAY_ENABLED(dev_priv))









	if (!HAS_DISPLAY(dev_priv))









		return;

















	if (IS_ROCKETLAKE(dev_priv)) {


































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



+3
−0






























Original line number
Diff line number
Diff line







@@ -6103,6 +6103,9 @@ intel_dp_detect(struct drm_connector *connector,







	drm_WARN_ON(&dev_priv->drm,









		    !drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));



















	if (!INTEL_DISPLAY_ENABLED(dev_priv))









		return connector_status_disconnected;



















	/* Can't disconnect eDP */









	if (intel_dp_is_edp(intel_dp))









		status = edp_detect(intel_dp);


































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



+4
−0






























Original line number
Diff line number
Diff line







@@ -719,9 +719,13 @@ static int







intel_dp_mst_detect(struct drm_connector *connector,









		    struct drm_modeset_acquire_ctx *ctx, bool force)









{









	struct drm_i915_private *i915 = to_i915(connector->dev);









	struct intel_connector *intel_connector = to_intel_connector(connector);









	struct intel_dp *intel_dp = intel_connector->mst_port;



















	if (!INTEL_DISPLAY_ENABLED(i915))









		return connector_status_disconnected;



















	if (drm_connector_is_unregistered(connector))









		return connector_status_disconnected;