From patchwork Tue Oct 17 08:18:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10011173 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 BD88460211 for ; Tue, 17 Oct 2017 08:24:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A982D28632 for ; Tue, 17 Oct 2017 08:24:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E3F728705; Tue, 17 Oct 2017 08:24:17 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable 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 7779328632 for ; Tue, 17 Oct 2017 08:24:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E2A66E5A0; Tue, 17 Oct 2017 08:24:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 323 seconds by postgrey-1.35 at gabe; Tue, 17 Oct 2017 08:24:13 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 321FC6E59B; Tue, 17 Oct 2017 08:24:12 +0000 (UTC) Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MVd8x-1djkri11Qt-00Ywnr; Tue, 17 Oct 2017 10:18:37 +0200 From: Arnd Bergmann To: broonie@kernel.org Subject: [PATCH] linux-next: drm/i916: fix nop_submit_request mismerge Date: Tue, 17 Oct 2017 10:18:25 +0200 Message-Id: <20171017081835.3792306-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:izAbUn/E96ZNhF1peX60SbCR9s5su/AB970SxKFRrq8qTp4dKHx nkIrNlzQSFqMUVsMsd4oOyNpX9ojUvxCbl2i74PYNTgV0IOwiwji77mDHyChIMcGpJZS/c/ li9hx/mvOsxsnUwoYs/bYqmvykGu8YYy0NTg3QmKYG6uwSOlzF4ubO4picThIvpdwuDcNPZ hFaTJyy01ijhnFXFrukWg== X-UI-Out-Filterresults: notjunk:1; V01:K0:IO/CzuVPkys=:D+jFH5559C6/hJyprwDPsA wRgwKhSP6DmiZbQDRJI5kOuVBeQ5nmE1LQK/bwRro4E3NqWfTFgUDPDEREM+LqYfJ7tfsIRXA xJ6e0UPc9zTNEDhlqPiXxT8U1O2i4+kkgKMRTevZ5MxMkFoQvU06V2L830hHrL3HRtS/zQG2T QBm8HaK06uLvJAp1ZmjylsvHFjGP+o2wvKQyo56fSVFlyLkF4LtwRqEARVro6P9NmgaawFwfg oYGyMa00F+Q95FkwP6C89yRezWQM6CkW5f+KT2XShB80lDL6sRvH4asEx/wC3InUGJWYxyA0z dueB/p7jS+vdS6et3/qxXWH18McE1hVO6/8WNEk8APVJdz+RexGbaOu5+LXakU5by00QYLAaH /O8uMTvRmYW9lUYQZAVGLlYBGxO1XdQQMh4nOpkPAdix8h5piFT4+pQJnLepWT38VUNnwZK9f rmB/dDNv4bJvLRAikTcbpM185YaygBMqJJkDDhthb8EieX+FBF3ILjRONfN1cfuLwtz902Eg9 NFLhb6M775mpNbbR64v6EyU7/mahygESbU+7Mq0xSJgEWaxvfRaWjBZuZ9m4OnP6lH1ovRMAb KOSrskHSOf5p+X8W9AbkWzc0wCbxa458/AHqK00kwZoo6ETKM8wfkc0hl3D5BOyqnjCPDS2gF Zq4HVIBpy7Z2NoHKQ0dmH8bzm2GloUfHamsXGIyg96iRjZyoXicVZl02xSLEEEwoLRQC3EPnF ITCIR+qkaVzZXXzFrEYa/237Ut6/0UwEKpyqxg== Cc: Arnd Bergmann , Tvrtko Ursulin , Mika Kuoppala , intel-gfx@lists.freedesktop.org, Joonas Lahtinen , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi , akpm@linux-foundation.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP A mismerge in linux-next caused a build failure: drivers/gpu/drm/i915/i915_gem.c: In function 'nop_submit_request': drivers/gpu/drm/i915/i915_gem.c:3092:54: error: 'flags' undeclared (first use in this function); did you mean 'class'? This is the fixup I used to get a clean build on top of today's tree. I don't know which of the versions is the one we want, so this may just as well be wrong. Fixes: 05724bd054c3 ("Merge branch 'akpm/master'") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b4b62f427a99..ee2aee869dc6 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3087,6 +3087,8 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv) static void nop_submit_request(struct drm_i915_gem_request *request) { + unsigned long flags; + dma_fence_set_error(&request->fence, -EIO); spin_lock_irqsave(&request->engine->timeline->lock, flags);