From patchwork Fri Sep 25 06:09:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Egbert Eich X-Patchwork-Id: 7262351 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 78324BEEC1 for ; Fri, 25 Sep 2015 06:10:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8EAD52095B for ; Fri, 25 Sep 2015 06:10:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7CA3B20957 for ; Fri, 25 Sep 2015 06:10:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 041426E056; Thu, 24 Sep 2015 23:10:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4EC6A6E056 for ; Thu, 24 Sep 2015 23:10:40 -0700 (PDT) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0923AAABB; Fri, 25 Sep 2015 06:10:38 +0000 (UTC) Received: from sles12.fritz.box (sles12.fritz.box [192.168.178.37]) by debian (Postfix) with ESMTP id 08785E12C1; Fri, 25 Sep 2015 08:10:16 +0200 (CEST) From: Egbert Eich To: intel-gfx@lists.freedesktop.org Date: Fri, 25 Sep 2015 08:09:57 +0200 Message-Id: <1443161397-17418-1-git-send-email-eich@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <22018.51387.40148.91302@linux-qknr.fritz.box> References: <22018.51387.40148.91302@linux-qknr.fritz.box> Cc: Egbert Eich , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: On reset/suspend disable hpd pins & cancel pending delayed work X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This makes sure no hpd interrupt or reenable worker fires when resetting or suspending. We already call intel_hpd_init() in most cases on resume and after reset to undo this. Signed-off-by: Egbert Eich --- drivers/gpu/drm/i915/i915_drv.c | 3 +++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 5 +++-- drivers/gpu/drm/i915/intel_hotplug.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index e2bf9e2..cb8d75f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -620,6 +620,7 @@ static int i915_drm_suspend(struct drm_device *dev) intel_dp_mst_suspend(dev); + intel_hpd_uninit(dev_priv); intel_runtime_pm_disable_interrupts(dev_priv); intel_hpd_cancel_work(dev_priv); @@ -1477,12 +1478,14 @@ static int intel_runtime_suspend(struct device *device) mutex_unlock(&dev->struct_mutex); intel_suspend_gt_powersave(dev); + intel_hpd_uninit(dev_priv); intel_runtime_pm_disable_interrupts(dev_priv); ret = intel_suspend_complete(dev_priv); if (ret) { DRM_ERROR("Runtime suspend failed, disabling it (%d)\n", ret); intel_runtime_pm_enable_interrupts(dev_priv); + intel_hpd_init(dev_priv); return ret; } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a6b7576..3c06629 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2688,6 +2688,7 @@ void i915_firmware_load_error_print(const char *fw_path, int err); /* intel_hotplug.c */ void intel_hpd_irq_handler(struct drm_device *dev, u32 pin_mask, u32 long_mask); void intel_hpd_init(struct drm_i915_private *dev_priv); +void intel_hpd_uninit(struct drm_i915_private *dev_priv); void intel_hpd_init_work(struct drm_i915_private *dev_priv); void intel_hpd_cancel_work(struct drm_i915_private *dev_priv); bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fc00867..fadd4f2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3207,16 +3207,17 @@ void intel_finish_reset(struct drm_device *dev) * The display has been reset as well, * so need a full re-initialization. */ + intel_hpd_uninit(dev_priv); intel_runtime_pm_disable_interrupts(dev_priv); intel_runtime_pm_enable_interrupts(dev_priv); intel_modeset_init_hw(dev); - +#if 0 spin_lock_irq(&dev_priv->irq_lock); if (dev_priv->display.hpd_irq_setup) dev_priv->display.hpd_irq_setup(dev); spin_unlock_irq(&dev_priv->irq_lock); - +#endif intel_display_resume(dev); intel_hpd_init(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c index b177857..4f2a179 100644 --- a/drivers/gpu/drm/i915/intel_hotplug.c +++ b/drivers/gpu/drm/i915/intel_hotplug.c @@ -484,6 +484,34 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) spin_unlock_irq(&dev_priv->irq_lock); } +/** + * intel_hpd_uninit - disable and deinitialize hpd support + * @dev_priv: i915 device instance + * + * This function disables any pending delayed work for HPD and + * disables all hpd pins. Calling this during suspend/reset + * avoids conflicts with the reenable worker of interrupt handler + * firing. + * At resume we call intel_hpd_init() to reenable things. + */ +void intel_hpd_uninit(struct drm_i915_private *dev_priv) +{ + struct drm_device *dev = dev_priv->dev; + int i; + + cancel_delayed_work_sync(&dev_priv->hotplug.reenable_work); + + spin_lock_irq(&dev_priv->irq_lock); + + for_each_hpd_pin(i) { + dev_priv->hotplug.stats[i].state = HPD_DISABLED; + } + if (dev_priv->display.hpd_irq_setup) + dev_priv->display.hpd_irq_setup(dev); + + spin_unlock_irq(&dev_priv->irq_lock); +} + void intel_hpd_init_work(struct drm_i915_private *dev_priv) { INIT_WORK(&dev_priv->hotplug.hotplug_work, i915_hotplug_work_func);