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

drm/i915: Mark all HPD capabled connectors as such 



Currently we only set the DRM_CONNECTOR_POLL_{DISCONNECT,CONNECT}
bits in intel_connector->polled (the base setting), leading to
some confusing looking code to reset drm_connector->polled
(the actual setting) to DRM_CONNECTOR_POLL_HPD. Let's set
intel_connector->polled = DRM_CONNECTOR_POLL_HPD for all hpd
capable connectors, and then we don't need so many special
cases in the hotplug code.

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


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

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

+1 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv) 
	    !dmi_check_system(intel_spurious_crt_detect)) {

		crt->base.hpd_pin = HPD_CRT;

		crt->base.hotplug = intel_encoder_hotplug;

		intel_connector->polled = DRM_CONNECTOR_POLL_HPD;

	} else {

		intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -7710,6 +7710,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		connector->ycbcr_420_allowed = true;



	intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);

	intel_connector->polled = DRM_CONNECTOR_POLL_HPD;



	intel_dp_aux_init(intel_dp);

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

+1 −0
Original line number Diff line number Diff line
@@ -3176,6 +3176,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, 
		connector->ycbcr_420_allowed = true;



	intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);

	intel_connector->polled = DRM_CONNECTOR_POLL_HPD;



	if (HAS_DDI(dev_priv))

		intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;

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

+8 −9
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) 
			DRM_DEBUG_DRIVER("Reenabling HPD on connector %s\n",

					 connector->base.name);

		connector->base.polled = connector->polled;

		if (!connector->base.polled)

			connector->base.polled = DRM_CONNECTOR_POLL_HPD;

	}

	drm_connector_list_iter_end(&conn_iter);
@@ -620,16 +618,17 @@ static void i915_hpd_poll_init_work(struct work_struct *work) 


	drm_connector_list_iter_begin(dev, &conn_iter);

	for_each_intel_connector_iter(connector, &conn_iter) {

		enum hpd_pin pin = intel_connector_hpd_pin(connector);

		enum hpd_pin pin;



		pin = intel_connector_hpd_pin(connector);

		if (pin == HPD_NONE)

			continue;



		connector->base.polled = connector->polled;



		if (pin != HPD_NONE && I915_HAS_HOTPLUG(dev_priv) &&

		    !connector->base.polled)

			connector->base.polled = enabled ?

				DRM_CONNECTOR_POLL_CONNECT |

				DRM_CONNECTOR_POLL_DISCONNECT :

				DRM_CONNECTOR_POLL_HPD;

		if (enabled && connector->base.polled == DRM_CONNECTOR_POLL_HPD)

			connector->base.polled = DRM_CONNECTOR_POLL_CONNECT |

				DRM_CONNECTOR_POLL_DISCONNECT;

	}

	drm_connector_list_iter_end(&conn_iter);

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

+1 −0
Original line number Diff line number Diff line
@@ -2721,6 +2721,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) 
		 * Some SDVO devices have one-shot hotplug interrupts.

		 * Ensure that they get re-enabled when an interrupt happens.

		 */

		intel_connector->polled = DRM_CONNECTOR_POLL_HPD;

		intel_encoder->hotplug = intel_sdvo_hotplug;

		intel_sdvo_enable_hotplug(intel_encoder);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE