From patchwork Fri Jan 2 17:19:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 5560141 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 42226BF6C3 for ; Fri, 2 Jan 2015 17:20:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6281820256 for ; Fri, 2 Jan 2015 17:20:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2AE3C20109 for ; Fri, 2 Jan 2015 17:20:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 929C36E395; Fri, 2 Jan 2015 09:20:16 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by gabe.freedesktop.org (Postfix) with ESMTP id E1BE46E395 for ; Fri, 2 Jan 2015 09:20:15 -0800 (PST) Received: by mail-vc0-f182.google.com with SMTP id hq12so7242639vcb.27 for ; Fri, 02 Jan 2015 09:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=5srv+y5O3cieQHsRuvZOtmXI8Qje7+fsaU1vpHdBhjA=; b=ySzX/JZLkJgdwLUEPIIfuyOE2jn6/tJpikwTAsg7adJq2p+If39txdCejcoGxk5GUz zNZYy1t6eZ4cfNch3797J/RxwT3tpc9h4PSme/NUQ/VPbFnLDdXIgUxACy0TDKVblcCV W85RTyx6d+UrPma5HhJ+6Nixl3Va/tJ8I3iogfpNTEOjeHKnZH7r4iZCl+A/4HvLoAE7 +lv8TFvCtbtqbhgwZGeCiVQrHvi10w8Cbo+Xmrhs2Si+PgTvOYkmrGlK0FVGz5/B5dNB vy5PKEUb5EI5Zbm7y+8L/sa6/3NxwXNTeCDvdnO+LlnP/lie0S2kbLJQszfupK+JglQX Xn3g== X-Received: by 10.52.110.195 with SMTP id ic3mr39427200vdb.47.1420219215448; Fri, 02 Jan 2015 09:20:15 -0800 (PST) Received: from localhost.localdomain ([177.220.182.131]) by mx.google.com with ESMTPSA id qf19sm292803vdb.26.2015.01.02.09.20.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jan 2015 09:20:14 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 2 Jan 2015 15:19:13 -0200 Message-Id: <1420219153-1493-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 2.1.4 Cc: Paulo Zanoni Subject: [Intel-gfx] [RFC] Revert "drm/i915/bdw: Enable execlists by default where supported" 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 From: Paulo Zanoni This reverts commit 27401d126b5b1c8dd4df98bbb60b09ff2b3d5e60. When we run the Runtime PM test suite, all the test cases that happen after the system-suspend test always fail on my BDW machine. Testcase: igt/pm_rpm/system-suspend-execbuf Testcase: igt/pm_rpm/system-suspend-modeset Testcase: igt/pm_rpm/gem-execbuf-stress (and others ran after the system-suspend subtest) Cc: Thomas Daniel Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_params.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) The regression was not detected by PRTS. I guess that is because we don't run S3 tests on PRTS? It would be good to find out why and see what we could to do run these tests on PRTS. I'm going on vacation, so I won't really be able to track the status of this patch and that's why I sent the revert without reporting the bug first. I am hoping both Daniels will discuss this and decide if they want to merge this or try to find the proper fix first. diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 07252d8..db07153 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -35,7 +35,7 @@ struct i915_params i915 __read_mostly = { .vbt_sdvo_panel_type = -1, .enable_rc6 = -1, .enable_fbc = -1, - .enable_execlists = -1, + .enable_execlists = 0, .enable_hangcheck = true, .enable_ppgtt = -1, .enable_psr = 0, @@ -123,7 +123,7 @@ MODULE_PARM_DESC(enable_ppgtt, module_param_named(enable_execlists, i915.enable_execlists, int, 0400); MODULE_PARM_DESC(enable_execlists, "Override execlists usage. " - "(-1=auto [default], 0=disabled, 1=enabled)"); + "(-1=auto, 0=disabled [default], 1=enabled)"); module_param_named(enable_psr, i915.enable_psr, int, 0600); MODULE_PARM_DESC(enable_psr, "Enable PSR (default: false)"); diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7670a0f..f8b96c0 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -212,7 +212,8 @@ static int intel_lr_context_pin(struct intel_engine_cs *ring, * @enable_execlists: value of i915.enable_execlists module parameter. * * Only certain platforms support Execlists (the prerequisites being - * support for Logical Ring Contexts and Aliasing PPGTT or better). + * support for Logical Ring Contexts and Aliasing PPGTT or better), + * and only when enabled via module parameter. * * Return: 1 if Execlists is supported and has to be enabled. */