From patchwork Fri Oct 2 03:42:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11812829 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E097A6CA for ; Fri, 2 Oct 2020 03:42:21 +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 7371D20795 for ; Fri, 2 Oct 2020 03:42:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="gSaJ4Q0A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7371D20795 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 D51D66E07D; Fri, 2 Oct 2020 03:42:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 497806E07D for ; Fri, 2 Oct 2020 03:42:16 +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 4C2bQr3vLyz9sPB; Fri, 2 Oct 2020 13:42:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601610134; bh=j5vGAk2m5xIhyg7SquaATB4YzkE8TxVVBcZ8BR5MTE4=; h=Date:From:To:Cc:Subject:From; b=gSaJ4Q0AK97zVYof45s9TECWj1RSE8s1/1viB2n3wyUarvrifZ5Lin7a8b49goiiZ WgTbiJbuwnU9/vlzjK2x+YaAwDdcExd29alD/23nbMIHXMIgs66GXH4IwBe7dNKCYD vyPiMLANXDgjKxGhE8Ags2RztcktZIe1Gptv9EVRVc12gOft7xE0ML77es/HBDr+nn L2qWZrN1ehxop4z+wLXR3qcXXMmcL9a4YKF/PmcQPBv2YpDIWYRr1u0aNHcIVFDsu3 G9IgDyz0AwoDxzCetPgv1ntDzsiw6ezd/My8BzuYwD0QTDQHanBOhJ7ADuozmCjYnA HAEIAfVUGpZ5w== Date: Fri, 2 Oct 2020 13:42:10 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20201002134210.15a612d7@canb.auug.org.au> MIME-Version: 1.0 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: , Cc: Alex Deucher , Linux Next Mailing List , Evan Quan , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c between commit: b19515253623 ("drm/amd/pm: setup APU dpm clock table in SMU HW initialization") from the Linus tree and commits: 82cac71c1b64 ("drm/amd/pm: put Navi1X umc cdr workaround in post_smu_init") 236b156f7388 ("drm/amd/pm: apply no power source workaround if dc reported by gpio") 1653a179c822 ("drm/amd/pm: move NAVI1X power mode switching workaround to post_init") 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. diff --cc drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index 8dc5abb6931e,5c4b74f964fc..000000000000 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c