From patchwork Wed Oct 24 19:00:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 1640181 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 92B453FD4E for ; Wed, 24 Oct 2012 19:05:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96A349EEB1 for ; Wed, 24 Oct 2012 12:05:09 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f49.google.com (mail-yh0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 51E4EA02F6 for ; Wed, 24 Oct 2012 12:04:23 -0700 (PDT) Received: by mail-yh0-f49.google.com with SMTP id j52so166081yhj.36 for ; Wed, 24 Oct 2012 12:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=63T/itlUc5p1ZILadTmU1iUt0N8syo5pWE1VGhlaOfo=; b=Nyy6FDrK9MtlitSYEO4ein+BC4JLMzPAM0sFdSe5L2ZnI6ghE8cr/DV+D7sb1tBgGw pJGotCc8kRp2zUhycZIqMDFFVgJ6C8qi0wpMUzGLphSckHPDhEC2WndqFIQwsi82v4Sl i1hUZ/gz+cXxOSv37hW+XHKQO6rSG33VjgeNqAd7+i/yWHywtnyxwtGePIuYaPqmyro6 Lqelx2S5sFNUZoiTe7PR6VQHkbKkiZ5kLHrbmEIvpO9soSfPIbWIppf/V5JTK3uv4vAv YhQ/uyDVGZy09iarAnj+9R3uOutITzee28Snz4pAxrR6K0YJ88UFnhXw016fDv7az3ML Hefw== Received: by 10.101.179.11 with SMTP id g11mr5060585anp.22.1351105462791; Wed, 24 Oct 2012 12:04:22 -0700 (PDT) Received: from localhost.localdomain (200.188.217.18.dedicated.neoviatelecom.com.br. [200.188.217.18]) by mx.google.com with ESMTPS id b46sm15613669yhn.5.2012.10.24.12.04.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 12:04:22 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Wed, 24 Oct 2012 17:00:50 -0200 Message-Id: <1351105250-26394-2-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351105250-26394-1-git-send-email-rodrigo.vivi@gmail.com> References: <1351105250-26394-1-git-send-email-rodrigo.vivi@gmail.com> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Respect HW RC6 states availability 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 If Hardware doesn't allow RC6p or RC6pp we shall avoid end users turning them on, falling back to the only RC6 deepness available. Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_pm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 50f5809..a8c6c08 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2370,7 +2370,7 @@ 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 */ - if (i915_enable_rc6 >= 0) + if (i915_enable_rc6 = 0) return i915_enable_rc6; if (INTEL_INFO(dev)->gen == 5) { @@ -2394,6 +2394,9 @@ int intel_enable_rc6(const struct drm_device *dev) return INTEL_RC6_ENABLE; } + if (i915_enable_rc6 > 0) + return i915_enable_rc6; + DRM_DEBUG_DRIVER("RC6 and deep RC6 enabled\n"); return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE); }