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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 91711C33C99 for ; Wed, 8 Jan 2020 02:28:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62F37206F0 for ; Wed, 8 Jan 2020 02:28:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="YH8jqhW4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726401AbgAHC2R (ORCPT ); Tue, 7 Jan 2020 21:28:17 -0500 Received: from ozlabs.org ([203.11.71.1]:48603 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726389AbgAHC2R (ORCPT ); Tue, 7 Jan 2020 21:28:17 -0500 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 47stTB5bfQz9sPK; Wed, 8 Jan 2020 13:28:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1578450495; bh=qIPTOKRKoZocSMYk/jePlbzyF7dkyjJs35dUjd+61F8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=YH8jqhW41KHQOt4wqZod7LO09Ven0wXe+mlCighTRdYsdNp4T3oKPxE9uXMWo2tz/ f6EQYKx12FYL1kIMhriH59VVUVzKyvWnp1YsMmz51S2ep6YI9v3XJiQLpM5bPQLV6y RUwSL72Cp9USyqbz4kOJCav+pGteyEelxb1b3zFjjR64Cz88qpsCUv7GCTZt+FWi4o 5ufxVfFLb0uhD3X2znzGQiEQWNS7V/S/wjQGdfCT8bjQkf7IJDtNJ5n1UcHN0By7PH /gcsEAAMfePH4PeJTWfL1Mgy+e7g2pwgCFbs7eJSBq3RXeOi8xRbjOdY9wi4qNmFh8 P81PcXlGEIxYA== Date: Wed, 8 Jan 2020 13:28:14 +1100 From: Stephen Rothwell To: Dave Airlie , DRI , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics Cc: Linux Next Mailing List , Linux Kernel Mailing List , Chris Wilson Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20200108132814.2b170270@canb.auug.org.au> In-Reply-To: <20200108120450.33ec0fdd@canb.auug.org.au> References: <20200108120450.33ec0fdd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/U5JCEU3ui9U8iGqVoROUqCR"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/U5JCEU3ui9U8iGqVoROUqCR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell w= rote: > > - hw_flags =3D 0; > + /* For resource streamer on HSW+ and power context elsewhere */ > + BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN !=3D MI_SAVE_EXT_STATE_EN); > + BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN !=3D MI_RESTORE_EXT_STATE_EN); > + > + flags =3D MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT; > - if (!i915_gem_context_is_kernel(rq->gem_context)) > + if (!test_bit(CONTEXT_VALID_BIT, &ce->flags)) I see from the drm-intel tree that this should have not have the '!'. I have fixed up my resolution for tomorrow (and it has been fixed for today's linux-next in the merge of the drm-intel tree. --=20 Cheers, Stephen Rothwell --Sig_/U5JCEU3ui9U8iGqVoROUqCR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4VPj4ACgkQAVBC80lX 0Gzn/Af/artJrwNGLOouRdytZN+URVKTBfaZRujVoEZSz0XEBUTpnEa/hFFeYfFI ZNxPFB58dCUDdTkuJcoouWjfz+4a+JrO0B1h7yMXPHzXrRtyVQKRpOEFn3yXlF8l R5Q5Pp95lhOBgzcbU2tQsBRGc4Df2wwdL4VNo+dFFJw5xyuv/4vlSCnxHqJhGl6a B6ZaFFEVqpEHAmAcG2zrM29jCaHQnxUmRWjQSb+OzoH2ol29IZmnb+S0Qel1ueoF qmDVvj56+aKp7pcjbd+egfzSbhtMI6ZV6BX6lrBRmW4Dh1lW3km0ohNzay8hVu0g WvlOJl/9TZoOk743px9IMC5NN240dg== =5BoX -----END PGP SIGNATURE----- --Sig_/U5JCEU3ui9U8iGqVoROUqCR--