From patchwork Fri Jan 20 21:45:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9529541 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 546C8601AE for ; Fri, 20 Jan 2017 21:45:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69A382855B for ; Fri, 20 Jan 2017 21:45:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E875286BC; Fri, 20 Jan 2017 21:45:38 +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 E70D72855B for ; Fri, 20 Jan 2017 21:45:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A01866E201; Fri, 20 Jan 2017 21:45:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A9C56E201 for ; Fri, 20 Jan 2017 21:45:35 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id r126so9784680wmr.3 for ; Fri, 20 Jan 2017 13:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=z5uSRzvqr1lfnn+SUjTnIQLW9FvXWcTSiPQl7CnCT70=; b=tGGi2V16ZEMUoUGNGg3q/c4q1GtQpIoqAZ0IEM6trlLkvtroqp1q7TTXbcuR+S1PSe GWs592Vppc/4Pb25Cifm/Rcl9tN41r+TcBN3DfQ5JIjNSbsVWEXFrDtcxiKq7Aqrrs8B u9VG23UvWd7X0F02+/9D8MM8mK33VcJlxzOJBoM+myMGCOlrzOvGIuRD9BYlbknrgdcs iF/pTGQqP0v0zJseQjcygiEi/9a1Xx5dOftqxISXaQk5tbXpsFCgNKPishBVu177qdNr fFk4DjdQc1T+AMtB4v+K9Pojjz2csFJkEDMIqZnqxZVQUE3U2wMyKrzG2nXuQrXWaEES hbmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=z5uSRzvqr1lfnn+SUjTnIQLW9FvXWcTSiPQl7CnCT70=; b=SpTRPv+LXEjkCKl20UDD0NQHxmTAhFESKgsoxyW5BEWoB93QWcT4FFoxxbHAZSp3mo 23DzgtI+kDzxSTIzv7fpRan5mFIHskGaKOzgmKgwOGg5sv4Dj4VI8LYz1EK9K+ZtqrHm wg/Y+KTFACNInJ3P+sOSwfuKrePEQ2EOqxIogtqDq26M0jwLywltO5WZhV26iWEcnxHw 1plplwrw5ksXmfMSVUyETgjgeJUvKBuofzaWvGUnXxXhQWdoDHxEJDIqNXU92AmnzocT srYEKgvPSFpGAoURHUPTYFKDCTNDhBuQDRVWBpCcr6UQqOKirytdyIGeYvkT8+dWE+Cv Ppyw== X-Gm-Message-State: AIkVDXIkUq9fkQ6dcCW4g4VxQHwDosjfXGgk1h20RKCbkd0AHWrrUoglo88ka5zXpnwUsw== X-Received: by 10.223.178.243 with SMTP id g106mr16365769wrd.32.1484948733732; Fri, 20 Jan 2017 13:45:33 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id d29sm1568771wrc.42.2017.01.20.13.45.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Jan 2017 13:45:33 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 20 Jan 2017 21:45:30 +0000 Message-Id: <20170120214530.1062-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170120214530.1062-1-chris@chris-wilson.co.uk> References: <20170120214530.1062-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Silence smatch for cmdparser 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 drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue If we move the shift into each case not only do we kill the warning from smatch, but we shrink the code slightly: text data bss dec hex filename 1267906 20587 3168 1291661 13b58d before 1267890 20587 3168 1291645 13b57d after Signed-off-by: Chris Wilson Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/i915_cmd_parser.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index 420bbc220f35..650ee34f5786 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -800,22 +800,15 @@ struct cmd_node { */ static inline u32 cmd_header_key(u32 x) { - u32 shift; - switch (x >> INSTR_CLIENT_SHIFT) { default: case INSTR_MI_CLIENT: - shift = STD_MI_OPCODE_SHIFT; - break; + return x >> STD_MI_OPCODE_SHIFT; case INSTR_RC_CLIENT: - shift = STD_3D_OPCODE_SHIFT; - break; + return x >> STD_3D_OPCODE_SHIFT; case INSTR_BC_CLIENT: - shift = STD_2D_OPCODE_SHIFT; - break; + return x >> STD_2D_OPCODE_SHIFT; } - - return x >> shift; } static int init_hash_table(struct intel_engine_cs *engine,