From: Hans de Goede Date: Thu, 20 Dec 2018 13:21:19 +0000 (+0100) Subject: drm/i915: Allow calling intel_edp_drrs_enable twice X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~3392^2~22^2~57 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f69a0d71d49cbd22dab85e9654ec7a8fc7a7d057;p=mirror_ubuntu-focal-kernel.git drm/i915: Allow calling intel_edp_drrs_enable twice Do not make it an error to call intel_edp_drrs_enable while drrs has already been enabled, instead exit silently in this case. This is a preparation patch for ensuring that DRRS is enabled on fastsets. Note that the removed WARN_ON could also be triggered from userspace through the i915_drrs_ctl debugfs entry which was added by commit 35954e88bc50 ("drm/i915: Runtime disable for eDP DRRS") Reviewed-by: Maarten Lankhorst Signed-off-by: Hans de Goede Link: https://patchwork.freedesktop.org/patch/msgid/20181220132120.15318-2-hdegoede@redhat.com --- diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 5b601b754707..62fd11540942 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -6432,8 +6432,8 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp, } mutex_lock(&dev_priv->drrs.mutex); - if (WARN_ON(dev_priv->drrs.dp)) { - DRM_ERROR("DRRS already enabled\n"); + if (dev_priv->drrs.dp) { + DRM_DEBUG_KMS("DRRS already enabled\n"); goto unlock; }