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: 115900 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3574596qgn; Mon, 16 Oct 2017 04:35:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAx1cGJcfZmaiWYxR4s7O2jG1u87QdN7DRgxMnFUNniktknPPHeJo/ccxe85ilPDBTSyMUU X-Received: by 10.98.83.194 with SMTP id h185mr8612483pfb.42.1508153741411; Mon, 16 Oct 2017 04:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508153741; cv=none; d=google.com; s=arc-20160816; b=qsfwhQvSKzYM81VaYb01UAR3GBBENV06a1+Zq2no6TN4DNjBYQLZAIkuI3xe6J2h6R FT/RVu0cjWXJ8QffHZRYLkSbohfdfTQg2qhg0azUWT35t82sc16mECquctSQRMHpSk/b UVd0TAsokinQEDJYvs6Wc2ceeaEJLeuwGlgMrjsnDHyZnm5iwFnPeFMe/ZAeG8XGNdCa GVJ54zNc2gi3hqDSuIYVUNfoha4XvBnYm6RRpU7hGzorAXxri3UzhngG9CvLz43ivM4x 6RhfjRW/yDIvhCLigAADf6PvJe+L1fySzECKzLcLLc7y4JMvc8KleG0wsqWOGhjOhwGr 7SmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature :arc-authentication-results; bh=UahTEZ1UbIS32UUaSOjoPvnUZXv7e0oRfo39l5QHOvE=; b=yjH77Jutp59qx5jnJ3iRldaqiGXZhIDoVCtAGKmO3rk0QtbqThX5WleVoooA1xciyL CGUK0601ZajlwNzlFw+abjzq9HLUicpWOeLG4j+BHB0dSxZlnzEULJEfoATNhOH8HBqk V98+hqOo6MvIMlvboPM80THLyTOUEeZEdMJaZz/BHGoHuUlDkd8T5fQwP0hSxYzNdCOQ dbjZDP46urU2hCQbNWl3Icm/+N27T52fAk48b1jP1t73ccMvHdzFtmHv/lmkR1Dgmmsi izIiqDiUjVY95HP3+WspLz8J5t/cRomIVYx5paywBBZ6fI/cQ//v1GUr9iVGcop+w1xO Ub2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Bcd6hqMJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si4445291plw.416.2017.10.16.04.35.41; Mon, 16 Oct 2017 04:35:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Bcd6hqMJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbdJPLfj (ORCPT + 27 others); Mon, 16 Oct 2017 07:35:39 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:51076 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbdJPLfh (ORCPT ); Mon, 16 Oct 2017 07:35:37 -0400 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 Cc: Linux-Next Mailing List , Linux Kernel Mailing List 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 Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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);