From patchwork Mon Jun 17 18:33:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13701262 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 15AFEC27C79 for ; Mon, 17 Jun 2024 18:33:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4CF8110E06D; Mon, 17 Jun 2024 18:33:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="l5ky6mip"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B8D510E06D for ; Mon, 17 Jun 2024 18:33:21 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0B0166143F; Mon, 17 Jun 2024 18:33:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7632C2BD10; Mon, 17 Jun 2024 18:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718649200; bh=Gt5AbKd0+XH+0wVvRk0f/xTWi7oQGBUFmyKGBfxlRQs=; h=Date:From:To:Cc:Subject:From; b=l5ky6mip2fAi9OyJx8SV0jjuR3GhcX3VJ5uyUNfB2Re+py+2S4JN4TQlbxhyswOWL 7EE+KqdZTAW2plGjz1GBV4xMUUkr6ScT7ZKPGopdyYNgHc5bi6CzbhuQwKiXvBZirJ M3rCb2Fw5Jn17vhxoU8Qe63FXbd76FOl+nng17RWjTIz2zLqwwRcTGW5cQ5rSP98LH bNiu6w/IwXd78IGUk5gvzhsseDCA6b61Le0RtmiHsJW88JEfMx/B0G1GvMVLYbidrh NYJEhsXjDbHk/RH+ob8vwL+W27XCiHIe9lxqthALQX1k6NBkcVRkMDtcLXxtzLVoqv Im6MfFZ/QeeiA== Date: Mon, 17 Jun 2024 19:33:15 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Riana Tauro , Rodrigo Vivi , Thomas =?iso-8859-1?q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" Hi all, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/xe/xe_gt_idle.c drivers/gpu/drm/xe/xe_guc_pc.c between commits: 2470b141bfae2 ("drm/xe: move disable_c6 call") 7c877115da419 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion") from the drm-intel-fixes tree and commits: 21b7085546481 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion") 6800e63cf97ba ("drm/xe: move disable_c6 call") 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. +++ b/drivers/gpu/drm/xe/xe_gt_idle.c diff --cc drivers/gpu/drm/xe/xe_guc_pc.c index 23382ced4ea74,508f0d39b4ad5..0000000000000 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c diff --cc drivers/gpu/drm/xe/xe_gt_idle.c index 944770fb2daff,5d6181117ab26..0000000000000 --- a/drivers/gpu/drm/xe/xe_gt_idle.c