From patchwork Fri Mar 21 22:06:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 3876571 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5ADCBBF540 for ; Fri, 21 Mar 2014 22:07:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A43D2010B for ; Fri, 21 Mar 2014 22:07:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 937262014A for ; Fri, 21 Mar 2014 22:07:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84DF46E069; Fri, 21 Mar 2014 15:07:02 -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 A005F6E069 for ; Fri, 21 Mar 2014 15:07:01 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 21 Mar 2014 15:02:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,706,1389772800"; d="scan'208";a="505147179" Received: from unknown (HELO ironside.amr.corp.intel.com) ([10.255.13.176]) by orsmga002.jf.intel.com with ESMTP; 21 Mar 2014 15:07:00 -0700 From: Ben Widawsky To: Intel GFX Date: Fri, 21 Mar 2014 15:06:59 -0700 Message-Id: <1395439619-5173-1-git-send-email-benjamin.widawsky@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1395427701-13434-11-git-send-email-benjamin.widawsky@linux.intel.com> References: <1395427701-13434-11-git-send-email-benjamin.widawsky@linux.intel.com> Cc: Jani Nikula , Ben Widawsky , stable@vger.kernel.org Subject: [Intel-gfx] [PATCH 10/12] [v2] drm/i915: don't flood the logs about bdw semaphores X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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: Jani Nikula BDW is no longer flagged as preliminary hw, but without i915.preliminary_hw_support module param set the logs are filled with WARNs about it. Just make semaphores off the BDW per-chip default for now. v2: Spurious merge hunk leftover in v1 removed CC: Ben Widawsky Reported-by: Sebastien Dufour Signed-off-by: Jani Nikula Signed-off-by: Daniel Vetter [BDW 3.14 backport] Cc: stable@vger.kernel.org Signed-off-by: Ben Widawsky Conflicts: drivers/gpu/drm/i915/i915_drv.c --- drivers/gpu/drm/i915/i915_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ec7bb0f..8f16e11 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -476,10 +476,8 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) return false; /* Until we get further testing... */ - if (IS_GEN8(dev)) { - WARN_ON(!i915_preliminary_hw_support); + if (IS_GEN8(dev)) return false; - } if (i915_semaphores >= 0) return i915_semaphores;