|
@@ -503,6 +503,9 @@ void intel_psr_enable(struct intel_dp *intel_dp,
|
|
if (!crtc_state->has_psr)
|
|
if (!crtc_state->has_psr)
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
+ if (WARN_ON(!CAN_PSR(dev_priv)))
|
|
|
|
+ return;
|
|
|
|
+
|
|
WARN_ON(dev_priv->drrs.dp);
|
|
WARN_ON(dev_priv->drrs.dp);
|
|
mutex_lock(&dev_priv->psr.lock);
|
|
mutex_lock(&dev_priv->psr.lock);
|
|
if (dev_priv->psr.enabled) {
|
|
if (dev_priv->psr.enabled) {
|
|
@@ -633,6 +636,9 @@ void intel_psr_disable(struct intel_dp *intel_dp,
|
|
if (!old_crtc_state->has_psr)
|
|
if (!old_crtc_state->has_psr)
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
+ if (WARN_ON(!CAN_PSR(dev_priv)))
|
|
|
|
+ return;
|
|
|
|
+
|
|
mutex_lock(&dev_priv->psr.lock);
|
|
mutex_lock(&dev_priv->psr.lock);
|
|
if (!dev_priv->psr.enabled) {
|
|
if (!dev_priv->psr.enabled) {
|
|
mutex_unlock(&dev_priv->psr.lock);
|
|
mutex_unlock(&dev_priv->psr.lock);
|
|
@@ -913,6 +919,9 @@ void intel_psr_init(struct drm_i915_private *dev_priv)
|
|
dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
|
|
dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
|
|
HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
|
|
HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
|
|
|
|
|
|
|
|
+ if (!dev_priv->psr.sink_support)
|
|
|
|
+ return;
|
|
|
|
+
|
|
/* Per platform default: all disabled. */
|
|
/* Per platform default: all disabled. */
|
|
if (i915_modparams.enable_psr == -1)
|
|
if (i915_modparams.enable_psr == -1)
|
|
i915_modparams.enable_psr = 0;
|
|
i915_modparams.enable_psr = 0;
|