From patchwork Tue Feb 14 15:29:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9572111 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 F2F3A60578 for ; Tue, 14 Feb 2017 15:29:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E669127D16 for ; Tue, 14 Feb 2017 15:29:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB25928356; Tue, 14 Feb 2017 15:29:14 +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 C2B7E27D5E for ; Tue, 14 Feb 2017 15:29:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 12D956E768; Tue, 14 Feb 2017 15:29:13 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C2276E768 for ; Tue, 14 Feb 2017 15:29:11 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id k90so27925081wrc.3 for ; Tue, 14 Feb 2017 07:29:11 -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=h7KGjmf1fxkJtn+MK4TecN7thYkV5w2mVp6VSnoPK7E=; b=DQPa7i+ZV4nDZjO1grRC425J6rizsGzIgv8RRtJ/iVlXjUruH+d3hXJeRHlVKtSax0 rLmoXmk9Iq+j/nHaj+iX4m/+Gu9xn94OF4hSRjhlASltGR0pxXHC7sPkB+TNVwwCeJ/B Q5fwTbx8HvvZeOUC48UgddWbNRd8QoIMDqSMLfuxcueFaUdLH4oqHGGSyu+juaK0fwDp RXZ01aszEDt+42oth8dpJlRA6OHr1UPzSM8m6icuHC+N8VDpIaudbJ/mzU69BotB2cpr W2G9NMwba2Sk6ZGBBQPPsi7VNN+zY6pS09KJT+PfHi4rtTHjh3Gr3+d/bVIuXlumOS23 AiUw== 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=h7KGjmf1fxkJtn+MK4TecN7thYkV5w2mVp6VSnoPK7E=; b=K8lp4LBYU8Q36YRntH9Oc5Qp7BF1Jw0zP7kPFm3aF2gxj6JNvnYcFSQ5fHY/oKBTC/ uYwHwfHtL79tXpPnHqwx0Yc7X5qllwr2khftFQzBXei6H4Y/vS0nbyg0UJmMGEHsCEWE BXYOqbNmgFmfb2iSnNTZqnRvsyXhROeLk7tIk2JYdUxENWY2beHfL1zVKeXutCFCvRgU RAB4FY7vrb+WNnKWxARhbRYjk5m1y3jmgCM+A2LAjShb+7coG8cD1mdOLE8piuPGXFOs upkvU/QXBv9DH+4ku/Aj4BoZPfOzsgSVjSpec0yHIRiL3m5PlSWxpQiTWuPinofZD3+T AjoQ== X-Gm-Message-State: AMke39krB/cSzW7SEO7wgAwLd/avQNXHLRWf1eT9O0/sLf/WSnFR3nO7PYpC8cgG93VPHw== X-Received: by 10.223.139.12 with SMTP id n12mr25177964wra.176.1487086149826; Tue, 14 Feb 2017 07:29:09 -0800 (PST) Received: from t460p.intel ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id g11sm1170385wrb.63.2017.02.14.07.29.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 07:29:09 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 14 Feb 2017 15:29:01 +0000 Message-Id: <20170214152901.20361-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.9.3 Subject: [Intel-gfx] [PATCH] drm/i915: Fix uninitialized return from mi_set_context 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 For some reason my compiler (and CI as well) failed to spot the uninitialized ret in mi_set_context. Signed-off-by: Tvrtko Ursulin Fixes: 73dec95e6ba3 ("drm/i915: Emit to ringbuffer directly") Cc: Tvrtko Ursulin Cc: Chris Wilson Cc: Joonas Lahtinen Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 9037356536dc..262452055563 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -604,7 +604,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) i915.semaphores ? INTEL_INFO(dev_priv)->num_rings - 1 : 0; - int len, ret; + int len; /* w/a: If Flush TLB Invalidation Mode is enabled, driver must do a TLB * invalidation prior to MI_SET_CONTEXT. On GEN6 we don't set the value @@ -612,7 +612,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) * itlb_before_ctx_switch. */ if (IS_GEN6(dev_priv)) { - ret = engine->emit_flush(req, EMIT_INVALIDATE); + int ret = engine->emit_flush(req, EMIT_INVALIDATE); if (ret) return ret; } @@ -687,7 +687,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) intel_ring_advance(req, cs); - return ret; + return 0; } static int remap_l3(struct drm_i915_gem_request *req, int slice)