linux-next: manual merge of the drm-intel tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

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

between commit:

  fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")

from Linus' tree and commit:

  cd572b3bb27e ("drm/i915: Disable hotplug detection works during driver init/shutdown")

from the drm-intel tree.

I fixed it up (maybe, see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
index 7d2b8ce48fda,93f9985ef75c..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@@ -6040,21 -6062,11 +6059,21 @@@ static void intel_dp_oob_hotplug_event(
  {
  	struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
  	struct drm_i915_private *i915 = to_i915(connector->dev);
 +	bool hpd_high = hpd_state == connector_status_connected;
 +	unsigned int hpd_pin = encoder->hpd_pin;
 +	bool need_work = false;
  
  	spin_lock_irq(&i915->irq_lock);
 -	i915->display.hotplug.event_bits |= BIT(encoder->hpd_pin);
 +	if (hpd_high != test_bit(hpd_pin, &i915->display.hotplug.oob_hotplug_last_state)) {
 +		i915->display.hotplug.event_bits |= BIT(hpd_pin);
 +
 +		__assign_bit(hpd_pin, &i915->display.hotplug.oob_hotplug_last_state, hpd_high);
 +		need_work = true;
 +	}
  	spin_unlock_irq(&i915->irq_lock);
 -	intel_hpd_schedule_detection(i915);
 +
 +	if (need_work)
- 		queue_delayed_work(i915->unordered_wq, &i915->display.hotplug.hotplug_work, 0);
++		intel_hpd_schedule_detection(i915);
  }
  
  static const struct drm_connector_funcs intel_dp_connector_funcs = {

Attachment: pgpEFdTc3MHGk.pgp
Description: OpenPGP digital signature