Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c caused by commits 0cc4b69 (drm/i915: Mask LPSP to get PSR working even with Power Well in use by audio.) and 18b5992 (drm/i915: Calculate PSR register offsets from base + gen). I fixed it up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc drivers/gpu/drm/i915/intel_dp.c index bc6579e,c4c280c..f349931 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@@ -1549,8 -1558,8 +1558,8 @@@ static void intel_edp_psr_setup(struct intel_edp_psr_write_vsc(intel_dp, &psr_vsc); /* Avoid continuous PSR exit by masking memup and hpd */ - I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP | + I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP | - EDP_PSR_DEBUG_MASK_HPD); + EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); intel_dp->psr_setup_done = true; } -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
