Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm/i915 fixes from Dave Airlie:
"Just two i915 regression fixes, that should be it from me"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Actually retry with bit-banging after GMBUS timeout
drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW
+9
-4
+3
drivers/gpu/drm/i915/intel_audio.c
+3
drivers/gpu/drm/i915/intel_audio.c
···
527
527
528
528
mutex_lock(&dev_priv->av_mutex);
529
529
intel_dig_port->audio_connector = connector;
530
+
/* referred in audio callbacks */
531
+
dev_priv->dig_port_map[port] = intel_encoder;
530
532
mutex_unlock(&dev_priv->av_mutex);
531
533
532
534
if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
···
556
554
557
555
mutex_lock(&dev_priv->av_mutex);
558
556
intel_dig_port->audio_connector = NULL;
557
+
dev_priv->dig_port_map[port] = NULL;
559
558
mutex_unlock(&dev_priv->av_mutex);
560
559
561
560
if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
-1
drivers/gpu/drm/i915/intel_ddi.c
-1
drivers/gpu/drm/i915/intel_ddi.c
···
3358
3358
intel_encoder->get_config = intel_ddi_get_config;
3359
3359
3360
3360
intel_dig_port->port = port;
3361
-
dev_priv->dig_port_map[port] = intel_encoder;
3362
3361
intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
3363
3362
(DDI_BUF_PORT_REVERSAL |
3364
3363
DDI_A_4_LANES);
-1
drivers/gpu/drm/i915/intel_dp.c
-1
drivers/gpu/drm/i915/intel_dp.c
-2
drivers/gpu/drm/i915/intel_hdmi.c
-2
drivers/gpu/drm/i915/intel_hdmi.c
···
2154
2154
void intel_hdmi_init(struct drm_device *dev,
2155
2155
i915_reg_t hdmi_reg, enum port port)
2156
2156
{
2157
-
struct drm_i915_private *dev_priv = dev->dev_private;
2158
2157
struct intel_digital_port *intel_dig_port;
2159
2158
struct intel_encoder *intel_encoder;
2160
2159
struct intel_connector *intel_connector;
···
2222
2223
intel_encoder->cloneable |= 1 << INTEL_OUTPUT_HDMI;
2223
2224
2224
2225
intel_dig_port->port = port;
2225
-
dev_priv->dig_port_map[port] = intel_encoder;
2226
2226
intel_dig_port->hdmi.hdmi_reg = hdmi_reg;
2227
2227
intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
2228
2228
+6
drivers/gpu/drm/i915/intel_i2c.c
+6
drivers/gpu/drm/i915/intel_i2c.c
···
664
664
665
665
bus->adapter.algo = &gmbus_algorithm;
666
666
667
+
/*
668
+
* We wish to retry with bit banging
669
+
* after a timed out GMBUS attempt.
670
+
*/
671
+
bus->adapter.retries = 1;
672
+
667
673
/* By default use a conservative clock rate */
668
674
bus->reg0 = pin | GMBUS_RATE_100KHZ;
669
675