From patchwork Wed Oct 24 22:05:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 1640921 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 6A85F3FCF7 for ; Wed, 24 Oct 2012 22:09:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F64DA093E for ; Wed, 24 Oct 2012 15:09:01 -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 983699E961 for ; Wed, 24 Oct 2012 15:08:51 -0700 (PDT) Received: by mail-yh0-f49.google.com with SMTP id j52so204071yhj.36 for ; Wed, 24 Oct 2012 15:08:51 -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=CjkchCun1XpA/AwFOIq8sKl22l2V82v65LmYVmW8vk8=; b=hM2ZyFAe5hajGe6qKlkE4zRNwN5twi/3Fja2KpEcecYQLk6jnrbzicGL2Eyv70Yonv Jm/WGueuwf/1bZ4PDt1dNFpP80/dehyMjHKaXmMZqfcbsHvj7NCqdoduMbAtB9sEh2KW mYVKMQF7cbAAlZP01wV74o1ha/RwuTs5SWodkVTSvPS0uw/iBHNshNJM2rGiB7Lv8TSG h1/zCahH+zszwTEnhabCQ2kTVybnZ84xGNwPGYx5oohaLITb2wse3NQcNxMIav7N90se /SaaYNdtdVUMs8C6YvwXKB/1+jIGJwEaOj+TarwSlUhl00djozXbkPOkkn0ia6FFcSAz iQQQ== Received: by 10.236.138.10 with SMTP id z10mr16922418yhi.39.1351116530863; Wed, 24 Oct 2012 15:08:50 -0700 (PDT) Received: from manamana.ajato.com.br ([187.121.76.253]) by mx.google.com with ESMTPS id l17sm11214131ank.4.2012.10.24.15.08.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 15:08:50 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Wed, 24 Oct 2012 20:05:15 -0200 Message-Id: <1351116315-1822-1-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <84c8a88hfcj@orsmga001.jf.intel.com> References: <84c8a88hfcj@orsmga001.jf.intel.com> Subject: [Intel-gfx] [PATCH] xdrm/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. v2: fixed "if" comparison pointed by Chris Wilson 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..b6362d0 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); }