Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit b19729617929 ("drm/i915:
fix psr match conditions screw ups") from the drm tree and commit
24acaf94ed4a ("drm/i915: Fix up PSR frontbuffer tracking") from the
drm-intel tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_dp.c
index eda73ea3002f,9274ddfd78c7..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -1801,20 -1762,17 +1796,18 @@@ static bool intel_edp_psr_match_conditi
  	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
  	struct drm_device *dev = dig_port->base.base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
 -	struct drm_crtc *crtc = dig_port->base.base.crtc;
 -	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 +	struct drm_crtc *crtc;
 +	struct intel_crtc *intel_crtc;
- 	struct drm_i915_gem_object *obj;
- 	struct intel_encoder *intel_encoder = &dp_to_dig_port(intel_dp)->base;
  
- 	dev_priv->psr.source_ok = false;
+ 	lockdep_assert_held(&dev_priv->psr.lock);
+ 	lockdep_assert_held(&dev->struct_mutex);
+ 	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
++	crtc = dig_port->base.base.crtc;
+ 	WARN_ON(!drm_modeset_is_locked(&crtc->mutex));
  
- 	if (!HAS_PSR(dev)) {
- 		DRM_DEBUG_KMS("PSR not supported on this platform\n");
- 		return false;
- 	}
+ 	dev_priv->psr.source_ok = false;
  
- 	if (IS_HASWELL(dev) && (intel_encoder->type != INTEL_OUTPUT_EDP ||
- 				dig_port->port != PORT_A)) {
+ 	if (IS_HASWELL(dev) && dig_port->port != PORT_A) {
  		DRM_DEBUG_KMS("HSW ties PSR to DDI A (eDP)\n");
  		return false;
  	}
@@@ -1847,11 -1786,6 +1821,7 @@@
  	if (IS_BROADWELL(dev))
  		goto out;
  
- 	if (I915_READ(SPRCTL(intel_crtc->pipe)) & SPRITE_ENABLE) {
- 		DRM_DEBUG_KMS("PSR condition failed: Sprite is Enabled\n");
- 		return false;
- 	}
- 
++	intel_crtc = to_intel_crtc(crtc);
  	if (I915_READ(HSW_STEREO_3D_CTL(intel_crtc->config.cpu_transcoder)) &
  	    S3D_ENABLE) {
  		DRM_DEBUG_KMS("PSR condition failed: Stereo 3D is Enabled\n");
@@@ -3712,10 -3620,7 +3753,8 @@@ intel_dp_detect(struct drm_connector *c
  	enum drm_connector_status status;
  	enum intel_display_power_domain power_domain;
  	struct edid *edid = NULL;
 +	bool ret;
  
- 	intel_runtime_pm_get(dev_priv);
- 
  	power_domain = intel_display_port_power_domain(intel_encoder);
  	intel_display_power_get(dev_priv, power_domain);