From patchwork Fri Jan 19 10:00:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10174953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8713660392 for ; Fri, 19 Jan 2018 10:00:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 750D628553 for ; Fri, 19 Jan 2018 10:00:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66CB42856E; Fri, 19 Jan 2018 10:00:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC97328553 for ; Fri, 19 Jan 2018 10:00:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 56BE56E8A3; Fri, 19 Jan 2018 10:00:17 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C4A26E8A1 for ; Fri, 19 Jan 2018 10:00:16 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g1so2243785wmg.2 for ; Fri, 19 Jan 2018 02:00:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=jtIXOI5rX2ai8rWchYTugsQekl+OiA1Asl5pXepTHZk=; b=V9QC8Vgn4QnzFA0YILrSdmNBDgN1iMb1UgE0l57g8JOruChROOAOMLIjWlEe3bVV+/ C+2ypqFvEMTE+KmpkzOSJGxi6vm5IuBovv2lOtuqx9a/U85JQV83ktuB1iZkEKO96GFW uZ1nWFNpxsSKGI4b+xcCd1MpD1yfveqGIoX56GApTUioikwWZ9i9u/ecbNcf+voCKXJM 9/rVGJnhWPDNEyEdsk5fgFynjBXDPi15rQpN3w83qtyEehYKh7v5ychcKdH9P0sMposn /aQBfKMdIZgWYT3DQxKD6HigJUrA7YYyRxb8/m3Nndlf/4QEbB2Y3OuD4AOd9TVLEkTc vTGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jtIXOI5rX2ai8rWchYTugsQekl+OiA1Asl5pXepTHZk=; b=dQ0x/y7JHaODBU76nLHWl9iBBGgxz65o1YkW174shaqsG0F5yI+AGqpUeSxnVPfEuE Rk5wUYZQWW+QKlOS0a9Ncy+KW23f4RpBzDS36sePWLcxuBc+mNGllqDFSkQvq+XrV/88 3qitRKQ3zSZ5fQdtNtc6kr8R0Gu90S0PFeAq7vx+z3Lkpw01JBREp8mJb+mk1G/Xw76L iZ+c0qLVxqDjo0cYdXVUz1eIEXgTKKrLIH6dtINTAhgEbl4Y0m0rOcSt6IM14pv6YvEx 3GYDuuGYbW48X2CSn+dOmr0DH6inIwaRI78bLKgVmt2d2yFCQi+uJVL+NpU5hRUccd0I gwWw== X-Gm-Message-State: AKwxytel8K2PqxoH5o9DAWvkJHEsNQfZ0aQk+fUW97mKk2eFcR70Js7M 2gnym1yFKQi9PuV+As7MRUINeLuX X-Google-Smtp-Source: ACJfBotN75N48QPiY7WDTZIiCgoaTwmhu7ZltuUkI1uRVOwfMO146vbY0YHt0e/Jys4aNw2fvnRRzw== X-Received: by 10.28.192.24 with SMTP id q24mr7923777wmf.149.1516356014830; Fri, 19 Jan 2018 02:00:14 -0800 (PST) Received: from localhost.localdomain ([95.146.148.3]) by smtp.gmail.com with ESMTPSA id e132sm940743wmd.40.2018.01.19.02.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2018 02:00:14 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 19 Jan 2018 10:00:03 +0000 Message-Id: <20180119100005.9072-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 Subject: [Intel-gfx] [PATCH 1/3] drm/i915: Downgrade incorrect engine constructor usage warnings to development 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-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Render engine constructor helpers must only be called from the render engine constructors, but there is no need to burden the production binaries with warnings which can only be triggered during development. Signed-off-by: Tvrtko Ursulin Cc: Michel Thierry Reviewed-by: Michel Thierry --- drivers/gpu/drm/i915/intel_engine_cs.c | 3 ++- drivers/gpu/drm/i915/intel_lrc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index d572b18d39eb..da05d38ba000 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1389,7 +1389,8 @@ int init_workarounds_ring(struct intel_engine_cs *engine) struct drm_i915_private *dev_priv = engine->i915; int err; - WARN_ON(engine->id != RCS); + if (GEM_WARN_ON(engine->id != RCS)) + return -EINVAL; dev_priv->workarounds.count = 0; dev_priv->workarounds.hw_whitelist_count[engine->id] = 0; diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 24ce781d39b7..334d44d415ab 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1416,7 +1416,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) unsigned int i; int ret; - if (WARN_ON(engine->id != RCS || !engine->scratch)) + if (GEM_WARN_ON(engine->id != RCS || !engine->scratch)) return -EINVAL; switch (INTEL_GEN(engine->i915)) {