From patchwork Tue Jul 24 21:33:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1233461 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 06DE83FD4F for ; Tue, 24 Jul 2012 21:24:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E4CC09F0E2 for ; Tue, 24 Jul 2012 14:24:47 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id BE5BF9EFCD for ; Tue, 24 Jul 2012 14:17:33 -0700 (PDT) Received: by wibhm2 with SMTP id hm2so3996603wib.0 for ; Tue, 24 Jul 2012 14:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=LWipjDsdIEUq065C8TOUPIbvm7whonN0vf2dUlU+RMI=; b=Rz+8o+BeyvnWvSVEQx3UzQu5SU7tdH/Fbj4nf4JsZuuDbrSec/wdlLJC+pzThST1Gq LnV4Cc+kJjY5dJFIr9CJK+eH4ZQR+33ZKXJX303U1yEivLM+1zYHtB4t0g7gz8ncrX/C AjbfjznwYQqWN4wDFvUtujWK2kkulmUsPFNxQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=LWipjDsdIEUq065C8TOUPIbvm7whonN0vf2dUlU+RMI=; b=QcoDuPvcjfKxoJRUHIIQXTqyakCeMJrXV35o+1Nkcb4P9PE9wf+kSBANTiQIM2MS/h 7zvb16i/jcMl6stoJBLoCqwfpZf9lwSfedfQZCNK6QxS+XdtTwsjdHcyz+RIt0s2OY88 fNZKqQw/c8EZRbo0XpmsOkjvAOif5vGCmtsBuIcyKD0a31rAmzxaCwG+UKCwnr3uHrmf jvX/ilP58318udOyx0dYXXp8Qlj/j1l8hnm2POXwpQCI36YXVZK2yTi9XiUoNGIu3dOe kBW5nxMAKUjGEupk5afDFsuXln7+YwRtqE+nFqgvBRgXrDXqEb6OIqEhf7oqz93zrV3p gT/Q== Received: by 10.180.84.1 with SMTP id u1mr8006892wiy.15.1343164652830; Tue, 24 Jul 2012 14:17:32 -0700 (PDT) Received: from hummel.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id cl8sm6258845wib.10.2012.07.24.14.17.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 14:17:32 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 24 Jul 2012 23:33:50 +0200 Message-Id: <1343165630-21604-10-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343165630-21604-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343165630-21604-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnWswGX/P9Wk0aOcNoW+5ZLI4Ml0r8O7bZIzsOwRYhlEY9l1OzeV+R4f8X4hZAY+XSXkru5 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 9/9] drm/i915: enable rc6 on ilk again 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 I have the faint hope that the total absence of any locking for the rps code wasn't too good an idea and could very well have caused some rc6 related regressions. Unfortunately we've never managed to reproduce these issues on any of our own machines, so the only way to go about this is to enable it and see what happens. While at it, kill some stale comments and improve the logging. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_pm.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 0056362..28db44e 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2343,31 +2343,26 @@ static void gen6_disable_rps(struct drm_device *dev) int intel_enable_rc6(const struct drm_device *dev) { - /* - * Respect the kernel parameter if it is set - */ + /* Respect the kernel parameter if it is set */ if (i915_enable_rc6 >= 0) return i915_enable_rc6; - /* - * Disable RC6 on Ironlake - */ - if (INTEL_INFO(dev)->gen == 5) - return 0; + if (INTEL_INFO(dev)->gen == 5) { + DRM_DEBUG_DRIVER("Ironlake: only RC6 available\n"); + return INTEL_RC6_ENABLE; + } - /* On Haswell, only RC6 is available. So let's enable it by default to - * provide better testing and coverage since the beginning. - */ - if (IS_HASWELL(dev)) + if (IS_HASWELL(dev)) { + DRM_DEBUG_DRIVER("Haswell: only RC6 available\n"); return INTEL_RC6_ENABLE; + } - /* - * Disable rc6 on Sandybridge - */ + /* snb/ivb have more than one rc6 state. */ if (INTEL_INFO(dev)->gen == 6) { DRM_DEBUG_DRIVER("Sandybridge: deep RC6 disabled\n"); return INTEL_RC6_ENABLE; } + DRM_DEBUG_DRIVER("RC6 and deep RC6 enabled\n"); return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE); }