From: Dave Airlie <[email protected]> On HSW/BDW the VBT can tell us if we need to have DP support for a port, if we don't have DP this caused an oops in the hpd handling.
Don't hook up the DP hpd handling if we don't have a DP port. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81856 Reported-by: Intel QA Team. Signed-off-by: Dave Airlie <[email protected]> --- drivers/gpu/drm/i915/intel_ddi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 9b1542f..42d4dce 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1557,11 +1557,13 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_encoder->cloneable = 0; intel_encoder->hot_plug = intel_ddi_hot_plug; - intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; - dev_priv->hpd_irq_port[port] = intel_dig_port; + if (init_dp) { + /* only hook up hpd processing for DP */ + intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; + dev_priv->hpd_irq_port[port] = intel_dig_port; - if (init_dp) dp_connector = intel_ddi_init_dp_connector(intel_dig_port); + } /* In theory we don't need the encoder->type check, but leave it just in * case we have some really bad VBTs... */ -- 1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
