From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933255AbdC3BIV (ORCPT ); Wed, 29 Mar 2017 21:08:21 -0400 Received: from ozlabs.org ([103.22.144.67]:57577 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933103AbdC3BIT (ORCPT ); Wed, 29 Mar 2017 21:08:19 -0400 Date: Thu, 30 Mar 2017 12:08:14 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Chris Wilson , Jani Nikula Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20170330120814.6c6900d1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_lrc.c between commit: dd68f2ba0720 ("drm/i915/execlists: Wrap tail pointer after reset tweaking") from the drm-intel-fixes tree and commit: 944a36d472be ("drm/i915: Assert that the request->tail is always qword aligned") from the drm 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_lrc.c index 91555d4e9129,77168e673e0a..000000000000 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@@ -1440,9 -1268,8 +1268,10 @@@ static void reset_common_ring(struct in GEM_BUG_ON(request->ctx != port[0].request->ctx); /* Reset WaIdleLiteRestore:bdw,skl as well */ - request->tail = request->wa_tail - WA_TAIL_DWORDS * sizeof(u32); + request->tail = + intel_ring_wrap(request->ring, + request->wa_tail - WA_TAIL_DWORDS*sizeof(u32)); + GEM_BUG_ON(!IS_ALIGNED(request->tail, 8)); } static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)