Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel into drm-next
Two i915 regression fixes. * tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel: drm/i915: Actually retry with bit-banging after GMBUS timeout drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW
This commit is contained in:
commit
125234dc8b
|
@ -527,6 +527,8 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
|
|||
|
||||
mutex_lock(&dev_priv->av_mutex);
|
||||
intel_dig_port->audio_connector = connector;
|
||||
/* referred in audio callbacks */
|
||||
dev_priv->dig_port_map[port] = intel_encoder;
|
||||
mutex_unlock(&dev_priv->av_mutex);
|
||||
|
||||
if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
|
||||
|
@ -554,6 +556,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
|
|||
|
||||
mutex_lock(&dev_priv->av_mutex);
|
||||
intel_dig_port->audio_connector = NULL;
|
||||
dev_priv->dig_port_map[port] = NULL;
|
||||
mutex_unlock(&dev_priv->av_mutex);
|
||||
|
||||
if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
|
||||
|
|
|
@ -3358,7 +3358,6 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
|
|||
intel_encoder->get_config = intel_ddi_get_config;
|
||||
|
||||
intel_dig_port->port = port;
|
||||
dev_priv->dig_port_map[port] = intel_encoder;
|
||||
intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
|
||||
(DDI_BUF_PORT_REVERSAL |
|
||||
DDI_A_4_LANES);
|
||||
|
|
|
@ -6045,7 +6045,6 @@ intel_dp_init(struct drm_device *dev,
|
|||
}
|
||||
|
||||
intel_dig_port->port = port;
|
||||
dev_priv->dig_port_map[port] = intel_encoder;
|
||||
intel_dig_port->dp.output_reg = output_reg;
|
||||
|
||||
intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
|
||||
|
|
|
@ -2154,7 +2154,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
|
|||
void intel_hdmi_init(struct drm_device *dev,
|
||||
i915_reg_t hdmi_reg, enum port port)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
struct intel_digital_port *intel_dig_port;
|
||||
struct intel_encoder *intel_encoder;
|
||||
struct intel_connector *intel_connector;
|
||||
|
@ -2223,7 +2222,6 @@ void intel_hdmi_init(struct drm_device *dev,
|
|||
intel_encoder->cloneable |= 1 << INTEL_OUTPUT_HDMI;
|
||||
|
||||
intel_dig_port->port = port;
|
||||
dev_priv->dig_port_map[port] = intel_encoder;
|
||||
intel_dig_port->hdmi.hdmi_reg = hdmi_reg;
|
||||
intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
|
||||
|
||||
|
|
|
@ -664,6 +664,12 @@ int intel_setup_gmbus(struct drm_device *dev)
|
|||
|
||||
bus->adapter.algo = &gmbus_algorithm;
|
||||
|
||||
/*
|
||||
* We wish to retry with bit banging
|
||||
* after a timed out GMBUS attempt.
|
||||
*/
|
||||
bus->adapter.retries = 1;
|
||||
|
||||
/* By default use a conservative clock rate */
|
||||
bus->reg0 = pin | GMBUS_RATE_100KHZ;
|
||||
|
||||
|
|
Loading…
Reference in a new issue