From patchwork Thu Oct 13 10:02:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9374685 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 490C7607FD for ; Thu, 13 Oct 2016 10:03:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BE4E29F7E for ; Thu, 13 Oct 2016 10:03:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3110F29F80; Thu, 13 Oct 2016 10:03:54 +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 DB55529F7E for ; Thu, 13 Oct 2016 10:03:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F091E6EA14; Thu, 13 Oct 2016 10:03:52 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D0416EA04 for ; Thu, 13 Oct 2016 10:03:23 +0000 (UTC) Received: by mail-qk0-x244.google.com with SMTP id n189so5494779qke.1 for ; Thu, 13 Oct 2016 03:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=P50cUWvqxcUNTD3IOYxQYCub8ZiYN5h6SoV9fhK9E6g=; b=nXWQ3JX9lhYXqOnbrpqbkN+6edawiiLLkDhQ6JzlEreerzz+B01HoUFpg6/yJkKFwY bxayUOIsYT3SFj+Gzpbhpy4KIjjYe62D5CbkN0QQPHH25M7FO5sDBnvcK/n6iMLlTMKY shXGRDuuRgq1NoV/Q7cSoICUhFIppUbKNWNNGYT8pqY4WusGkuCCRvaUsnvRbL4VwJbq LVMI03UImZWRFxGxEmQ07BQJFWP4j1xeF8+8Qqv/1DoWqXcj7e7m7BHPQDzRJijOOGCg M32zU5o2aOaAW2X6tQ9DqbPzVLCs4DSPub/Danc9RvRee1s39Oh72Aag4oETKGao4NOl 6PVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=P50cUWvqxcUNTD3IOYxQYCub8ZiYN5h6SoV9fhK9E6g=; b=bVKdyAVFbvE8+6ItLcbQB0KXseaATvqjThdouDWLCOxQoenu/4PGmtlIIwqMv7I90y BRrjAZtsLHVa0b7GsJRfV1yp/wTjdu8AKBJ/V7EdNfgO5OuW9FLCHtrDkUAlNQyv3nxh LZDMfROknWIBU6dpPtK8uA7vvGkqEnQdOMiilpaIY7/qFNoemdBhUBiy+CCT910t+e0P kZhxq1mcLglPLVGnx2VOt530+T4nAjf+6QSmQc02ObZTyQO7i/jHgUBrUh9rVzubVNla Yw/bQ56sqZOo8L941mU9uKzgOmCQVH7UOAIX/IANxSveqWiyKhXTeKLvJPITPhzKdj/W AqLQ== X-Gm-Message-State: AA6/9RnSW+A5ZYXggkwAGeLLEaNPPT5YnILEipMI/nqaGoHJE2t1F+B2Bv5FzIq1xKFgdQ== X-Received: by 10.194.28.166 with SMTP id c6mr6572191wjh.40.1476353001901; Thu, 13 Oct 2016 03:03:21 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:21 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 13 Oct 2016 11:02:56 +0100 Message-Id: <1476352990-2504-5-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476352990-2504-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [CI 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 Acked-by: Daniel Vetter Acked-by: Jani Nikula Acked-by: Chris Wilson Acked-by: Maarten Lankhorst --- 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 1d597feba97f..ed4b2704d602 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);