From patchwork Mon Jun 29 16:44:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 6690261 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 33DCAC05AC for ; Mon, 29 Jun 2015 16:45:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54CC120429 for ; Mon, 29 Jun 2015 16:45:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5B689203AA for ; Mon, 29 Jun 2015 16:45:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D664D72007; Mon, 29 Jun 2015 09:45:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 727FA6E680 for ; Mon, 29 Jun 2015 09:45:03 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 29 Jun 2015 09:45:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,699,1432623600"; d="scan'208";a="516038278" Received: from jgbauer-mobl2.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.47.67]) by FMSMGA003.fm.intel.com with ESMTP; 29 Jun 2015 09:45:02 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 29 Jun 2015 17:44:59 +0100 Message-Id: <1435596299-10058-2-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435596299-10058-1-git-send-email-damien.lespiau@intel.com> References: <1435596299-10058-1-git-send-email-damien.lespiau@intel.com> Cc: Suketu Shah Subject: [Intel-gfx] [PATCH 2/2] drm/i915/skl: Don't try to disable DC6 if the DMC firwmare isn't loaded 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.8 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 Currently, when the firwmare isn't loaded, we don't enable DC6 (obviously!) but the disable path tries unconditionally to disable DC6. [drm:i915_power_well_enable] enabling power well 1 [drm:i915_power_well_enable] enabling MISC IO power well [drm:i915_power_well_enable] enabling power well 2 ------------[ cut here ]------------ WARNING: CPU: 2 PID: 1935 at drivers/gpu/drm/i915/intel_csr.c:466 assert_csr_loaded+0xa9/0x100 [i915]() CSR is not loaded. Hardware name: Intel Corporation Skylake Client platform/Skylake Y LPDDR3 RVP3, BIOS SKLSE2P1.86C.X060.R00.1411120819 11/12/2014 ffffffffa01b3540 ffff88003f6ffa58 ffffffff8178875c 0000000000000000 ffff88003f6ffaa8 ffff88003f6ffa98 ffffffff8109425a ffff88003f965af0 ffff8801469e0000 ffff8801469e0340 0000000000000002 0000000030000003 Call Trace: [] dump_stack+0x45/0x57 [] warn_slowpath_common+0x8a/0xc0 [] warn_slowpath_fmt+0x46/0x50 [] assert_csr_loaded+0xa9/0x100 [i915] [] skl_set_power_well+0x75b/0xae0 [i915] [] skl_power_well_enable+0x13/0x20 [i915] [] i915_power_well_enable+0x28/0x50 [i915] [] intel_display_power_get+0xa3/0xd0 [i915] [] intel_dp_detect+0xa1/0x4e0 [i915] [] drm_helper_probe_single_connector_modes_merge_bits+0x300/0x4c0 [drm_kms_helper] [] ? drm_mode_getconnector+0x8e/0x400 [drm] [] drm_helper_probe_single_connector_modes+0x13/0x20 [drm_kms_helper] [] drm_mode_getconnector+0x369/0x400 [drm] [] ? might_fault+0x42/0xa0 [] drm_ioctl+0x359/0x690 [drm] [] ? drm_mode_getcrtc+0x150/0x150 [drm] [] do_vfs_ioctl+0x318/0x570 [] ? expand_files+0x221/0x260 [] ? selinux_file_ioctl+0x5b/0x110 [] SyS_ioctl+0x81/0xa0 [] system_call_fastpath+0x12/0x76 Cc: A.Sunil Kamath Cc: Suketu Shah Cc Animesh Manna Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90461 Signed-off-by: Damien Lespiau Signed-off-by: Damien Lespiau Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index ae80ffa..0d5a166 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -503,6 +503,9 @@ static void skl_disable_dc6(struct drm_i915_private *dev_priv) { uint32_t val; + if (intel_csr_load_status_get(dev_priv) != FW_LOADED) + return; + assert_can_disable_dc6(dev_priv); DRM_DEBUG_KMS("Disabling DC6\n");