From patchwork Mon Oct 16 11:35:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10008093 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 B4401601D5 for ; Mon, 16 Oct 2017 11:35:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A00592850F for ; Mon, 16 Oct 2017 11:35:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94EAB28517; Mon, 16 Oct 2017 11:35: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 532F92850F for ; Mon, 16 Oct 2017 11:35:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F6796E394; Mon, 16 Oct 2017 11:35:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [IPv6:2a01:7e01::f03c:91ff:fed4:a3b6]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC4DB6E386; Mon, 16 Oct 2017 11:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UahTEZ1UbIS32UUaSOjoPvnUZXv7e0oRfo39l5QHOvE=; b=Bcd6hqMJPtE5Z/aqn9Iw5YpoX PF2I5mlObE/Ir+gLbgLCg1Bxf80hLiVJLw6Gp3+4e9nkANGMYVUc79ZlTSrLcwHjZXG1reWpcfEP2 WMxeUUspcCKfvjdtUfUykI7LcbVmkZ1ocgZF8fHvnwvb6i5QSaRWgqCFn6z52JIG8zv3I=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1e43gA-0004Ak-Ke; Mon, 16 Oct 2017 11:35:30 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1e43g9-0004xE-Or; Mon, 16 Oct 2017 12:35:29 +0100 Date: Mon, 16 Oct 2017 12:35:29 +0100 From: Mark Brown To: Daniel Vetter , Intel Graphics , DRI , Chris Wilson , Tvrtko Ursulin , Rodrigo Vivi , Mika Kuoppala , Daniel Vetter Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: <20171016113529.ey35y6zwfyhdbvhe@sirena.co.uk> MIME-Version: 1.0 User-Agent: NeoMutt/20170609 (1.8.3) Cc: Linux-Next Mailing List , Linux Kernel Mailing List 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem.c between commit: b85577b72837e ("drm/i915: Order two completing nop_submit_request") from the drm-intel-fixes tree and commit: 5d031f4e1618b ("drm/i915: Stop asserting on set-wedged vs nop_submit_request ordering") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index bace56523e9f..4fdebca8ff40 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3089,20 +3089,14 @@ static void nop_submit_request(struct drm_i915_gem_request *request) { unsigned long flags; - GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error)); dma_fence_set_error(&request->fence, -EIO); - - spin_lock_irqsave(&request->engine->timeline->lock, flags); - __i915_gem_request_submit(request); - intel_engine_init_global_seqno(request->engine, request->global_seqno); - spin_unlock_irqrestore(&request->engine->timeline->lock, flags); + i915_gem_request_submit(request); } static void nop_complete_submit_request(struct drm_i915_gem_request *request) { unsigned long flags; - GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error)); dma_fence_set_error(&request->fence, -EIO); spin_lock_irqsave(&request->engine->timeline->lock, flags);