From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm tree with Linus' tree Date: Wed, 13 Nov 2019 11:40:34 +1100 Message-ID: <20191113114034.3332d688@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/gOUalc+A2t=HKgB0T6_S/nq"; protocol="application/pgp-signature"; micalg=pgp-sha256 Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jon Bloomfield , Mika Kuoppala , Chris Wilson List-Id: dri-devel@lists.freedesktop.org --Sig_/gOUalc+A2t=HKgB0T6_S/nq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_context.c between commit: f8c08d8faee5 ("drm/i915/cmdparser: Add support for backward jumps") from Linus' tree and commit: a4e7ccdac38e ("drm/i915: Move context management under GEM") 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gem/i915_gem_context.c index e41fd94ae5a9,de6e55af82cf..000000000000 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@@ -443,9 -527,10 +529,13 @@@ __create_context(struct drm_i915_privat for (i =3D 0; i < ARRAY_SIZE(ctx->hang_timestamp); i++) ctx->hang_timestamp[i] =3D jiffies - CONTEXT_FAST_HANG_JIFFIES; =20 + ctx->jump_whitelist =3D NULL; + ctx->jump_whitelist_cmds =3D 0; + + spin_lock(&i915->gem.contexts.lock); + list_add_tail(&ctx->link, &i915->gem.contexts.list); + spin_unlock(&i915->gem.contexts.lock); +=20 return ctx; =20 err_free: --Sig_/gOUalc+A2t=HKgB0T6_S/nq Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3LUQIACgkQAVBC80lX 0GybQQf8CjfWsd4l/CLD3ydwD6MgdMFfg2fzHEoMVGD9rdzzUWrCMHcckA4BUYe+ H0dF42iBBJJklIKeF4bA+R1ZuQx4wxGZJySBLmddAS6RJieyPnu+ztXbmeDrMEss RPc3nmNHN9ZkelMRBksUWDNRgMrmXqMgrECsFk5utQOphr41dV7ZFVcLbVAq2yuq Up7v36R0OivLnISQnpRvstW+TkgPDuoZ9e6zHGI4uAgbgJA1Rwa6HObkRQ9xko8w wcEscnH1Bcp2bAbcG4jTCJNrUY4ILYEskHTb5UJE9LmJtqo3WcJJ4xoSRvdf9A21 Q5MUZBnhrdlMtOBbLqIGdVpaNKu71Q== =X9cU -----END PGP SIGNATURE----- --Sig_/gOUalc+A2t=HKgB0T6_S/nq-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E484C17441 for ; Wed, 13 Nov 2019 00:40:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FC152196E for ; Wed, 13 Nov 2019 00:40:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FC152196E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 935876E124; Wed, 13 Nov 2019 00:40:42 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E5006E124 for ; Wed, 13 Nov 2019 00:40:40 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47CQkr1WLgz9sPh; Wed, 13 Nov 2019 11:40:35 +1100 (AEDT) Date: Wed, 13 Nov 2019 11:40:34 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20191113114034.3332d688@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1573605637; bh=zGB2x+uOiISDFNlvQBfSFlh+hinWcZ+bX2WnqS9eN/s=; h=Date:From:To:Cc:Subject:From; b=QOZye08E4DLQdE/1wDa4pOlovdLZGHrmxdKO7KfoHhdbrCW0pqagyPbYvZfxDZb4x 4V7Nr7a6M5YTAwOOCCbOrZzEZn8A5nv/mg3I1UAZOeV0if8jQcc87RGwZxOdh61TmH hqovx91m9xZ3LEFFP1/tRaTPsnOuaf9sla0TE83OKAy+cGL1loYWmVpys59HL0FhIO 6w5ersLHqSL556YiuDKbh+o94zGhwSlYu3DoSRr9GjKhRLPF5ID2nI27BSe/3TvU/P MIFfYuYchwHx6xD+nQsQ7O8y/CBbczPcu8/fKLGFgejp2SQtjRd6KGAeVRPlDkkyU3 TLAD7veaDxB6g== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mika Kuoppala , Linux Next Mailing List , Jon Bloomfield , Linux Kernel Mailing List Content-Type: multipart/mixed; boundary="===============0800138739==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191113004034.B7W3A1lj8IUrqPwbvN6ITmfOupFFjx9kqf0SgBAgq5Y@z> --===============0800138739== Content-Type: multipart/signed; boundary="Sig_/gOUalc+A2t=HKgB0T6_S/nq"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/gOUalc+A2t=HKgB0T6_S/nq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_context.c between commit: f8c08d8faee5 ("drm/i915/cmdparser: Add support for backward jumps") from Linus' tree and commit: a4e7ccdac38e ("drm/i915: Move context management under GEM") 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gem/i915_gem_context.c index e41fd94ae5a9,de6e55af82cf..000000000000 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@@ -443,9 -527,10 +529,13 @@@ __create_context(struct drm_i915_privat for (i =3D 0; i < ARRAY_SIZE(ctx->hang_timestamp); i++) ctx->hang_timestamp[i] =3D jiffies - CONTEXT_FAST_HANG_JIFFIES; =20 + ctx->jump_whitelist =3D NULL; + ctx->jump_whitelist_cmds =3D 0; + + spin_lock(&i915->gem.contexts.lock); + list_add_tail(&ctx->link, &i915->gem.contexts.list); + spin_unlock(&i915->gem.contexts.lock); +=20 return ctx; =20 err_free: --Sig_/gOUalc+A2t=HKgB0T6_S/nq Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3LUQIACgkQAVBC80lX 0GybQQf8CjfWsd4l/CLD3ydwD6MgdMFfg2fzHEoMVGD9rdzzUWrCMHcckA4BUYe+ H0dF42iBBJJklIKeF4bA+R1ZuQx4wxGZJySBLmddAS6RJieyPnu+ztXbmeDrMEss RPc3nmNHN9ZkelMRBksUWDNRgMrmXqMgrECsFk5utQOphr41dV7ZFVcLbVAq2yuq Up7v36R0OivLnISQnpRvstW+TkgPDuoZ9e6zHGI4uAgbgJA1Rwa6HObkRQ9xko8w wcEscnH1Bcp2bAbcG4jTCJNrUY4ILYEskHTb5UJE9LmJtqo3WcJJ4xoSRvdf9A21 Q5MUZBnhrdlMtOBbLqIGdVpaNKu71Q== =X9cU -----END PGP SIGNATURE----- --Sig_/gOUalc+A2t=HKgB0T6_S/nq-- --===============0800138739== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs --===============0800138739==--