From patchwork Thu Jul 11 08:02:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Xiong Y" X-Patchwork-Id: 2826053 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 511399F968 for ; Thu, 11 Jul 2013 07:59:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CE322010C for ; Thu, 11 Jul 2013 07:59:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 43A1E20107 for ; Thu, 11 Jul 2013 07:59:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EB64E64D7 for ; Thu, 11 Jul 2013 00:59:17 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CF748E5C8E for ; Thu, 11 Jul 2013 00:59:07 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 11 Jul 2013 00:56:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="4.87,1042,1363158000"; d="scan'208"; a="368313967" Received: from panda-dev.bj.intel.com ([10.238.154.175]) by orsmga002.jf.intel.com with ESMTP; 11 Jul 2013 00:59:02 -0700 From: Xiong Zhang To: intel-gfx@lists.freedesktop.org Date: Thu, 11 Jul 2013 16:02:27 +0800 Message-Id: <1373529747-29943-1-git-send-email-xiong.y.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Intel-gfx] [PATCH] drm/i915: Decrease pll->refcount when freeze gpu X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 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 display.crtc_mode_set will increase pll->refcount, but no one will decrease pll->refcount when freeze gpu. So when gpu resume from freeze, pll->refcount is still larger than zero. This is abnormal Without this patch, connecting vga screen on Haswell platform, there are following results: 1. when resume S3, call trace exist in intel_ddi_put_crtc_pll() 2. when resume s4, vga monitor is black. because intel_ddi_pll_mode_set() return false and haswell_crtc_mode_set() exit without setting mode With this patch, I don't find S3 and S4 regression on SandyBridge and IvyBridge platform connecting VGA, HDMI and DP screen. Signed-off-by: Xiong Zhang --- drivers/gpu/drm/i915/i915_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0485f43..0065735 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -575,8 +575,10 @@ static int i915_drm_freeze(struct drm_device *dev) * Disable CRTCs directly since we want to preserve sw state * for _thaw. */ - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { dev_priv->display.crtc_disable(crtc); + dev_priv->display.off(crtc); + } intel_modeset_suspend_hw(dev); }