From patchwork Tue Oct 11 13:21:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9370973 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 2A0086048F for ; Tue, 11 Oct 2016 13:22:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C6552900A for ; Tue, 11 Oct 2016 13:22:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 118282900F; Tue, 11 Oct 2016 13:22:22 +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 8F3EA2900A for ; Tue, 11 Oct 2016 13:22:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 044C56E66B; Tue, 11 Oct 2016 13:22:17 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90FC86E661 for ; Tue, 11 Oct 2016 13:22:14 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id b75so3720901lfg.3 for ; Tue, 11 Oct 2016 06:22:14 -0700 (PDT) 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:in-reply-to:references; bh=PkYWw8BhUSD7TrAmY9QnCIQTRMkJfoa5hLeLkuX1kuk=; b=K/q7sdE40m3aqbCppOUBFdsav3fmCa2A52/OUSkeuN9U619MsdLqvMQ8LxJrjBEpM3 y160UFtODYN8FJ+kgciCTNq4lupHDmMcg2e+fhK7Tr/fiohNBklAiDmg41W9w4DT/B1g b7ah2kvv/Z4MHWCrjpxROOJH4KuWhXDDnX+o/zx1nz3no0/iPhTGKJouYQ573zCuug3V lT+WjU7M989IJPwc5tu31ChqCyWekH4ovxB/ZpbSnJJAW7+uxhlb4y8DMH17BlK3CwuM pGCc/zOH7cS0dTtmIaWRzy+Wt4Phgy0pe+Mbj5GuVQAoDApYQGmb/SIBKOqryV1ZS9ow hzYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PkYWw8BhUSD7TrAmY9QnCIQTRMkJfoa5hLeLkuX1kuk=; b=Wzr/TsrzptC2S7+XG/LD8XrnXhtcFwYqFQTmISa5eQg9eq6Pkzkx7re5m3xoVMTTiD 3ojs5gkrj+jN8fUqz0OWx/eew4/HHfYfhJj9fk3C9f4ZyCufoeYgCfMiQjOoZnMBtXN8 jjbvKEm2U5ub5vUSHM7mjmp0dPAsLSk/6DOcEw38BT59N2wDyZGkobiAObwbRMvXKehl C92CVrdbtctV8TmeXLLRIaMr+SOqrrVS/dU+8jSRIcIRlbUED64QX0HdwKE00lNErCMl YxjwIs+fQOeMDfSJXXL70Gfwulfbj52ge15tt4CtVIDjwMgUJghSbJpZEd5za5iz6pX8 IMKA== X-Gm-Message-State: AA6/9Rl8+UsaIYI75AzEddH1cxXjU+pUZEwzAPHlGglCH0uhb08ZJ2jDaFTJBUGmZTK7WA== X-Received: by 10.194.103.41 with SMTP id ft9mr4925967wjb.8.1476192132689; Tue, 11 Oct 2016 06:22:12 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id zz9sm6387037wjb.36.2016.10.11.06.22.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2016 06:22:12 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 11 Oct 2016 14:21:38 +0100 Message-Id: <1476192112-25336-6-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476192112-25336-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476192112-25336-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 05/19] drm/i915: Do not use INTEL_INFO(dev_priv)->ring_mask inside WARNs 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 Saves 1520 bytes of .rodata strings. Signed-off-by: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/intel_engine_cs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index 480584c09306..03e11348eb32 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -110,13 +110,14 @@ int intel_engines_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); struct intel_device_info *device_info = mkwrite_device_info(dev_priv); + unsigned int ring_mask = INTEL_INFO(dev_priv)->ring_mask; unsigned int mask = 0; int (*init)(struct intel_engine_cs *engine); unsigned int i; int ret; - WARN_ON(INTEL_INFO(dev_priv)->ring_mask == 0); - WARN_ON(INTEL_INFO(dev_priv)->ring_mask & + WARN_ON(ring_mask == 0); + WARN_ON(ring_mask & GENMASK(sizeof(mask) * BITS_PER_BYTE - 1, I915_NUM_ENGINES)); for (i = 0; i < ARRAY_SIZE(intel_engines); i++) { @@ -143,7 +144,7 @@ int intel_engines_init(struct drm_device *dev) * are added to the driver by a warning and disabling the forgotten * engines. */ - if (WARN_ON(mask != INTEL_INFO(dev_priv)->ring_mask)) + if (WARN_ON(mask != ring_mask)) device_info->ring_mask = mask; device_info->num_rings = hweight32(mask);