From patchwork Sun Sep 15 21:26:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 11146171 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 86AE014ED for ; Sun, 15 Sep 2019 21:26:40 +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 6E81D2067D for ; Sun, 15 Sep 2019 21:26:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E81D2067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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 A3B5E6E02D; Sun, 15 Sep 2019 21:26:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [IPv6:2a01:7e01::f03c:91ff:fed4:a3b6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 553A96E02D for ; Sun, 15 Sep 2019 21:26:37 +0000 (UTC) Received: from ypsilon.sirena.org.uk ([2001:470:1f1d:6b5::7]) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9c2V-0001QF-9t; Sun, 15 Sep 2019 21:26:35 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 3B33327415FF; Sun, 15 Sep 2019 22:26:34 +0100 (BST) Date: Sun, 15 Sep 2019 22:26:34 +0100 From: Mark Brown To: Kevin Wang , Huang Rui , Alex Deucher , Prike Liang , Evan Quan , Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with the amdgpu tree Message-ID: <20190915212634.GI4352@sirena.co.uk> MIME-Version: 1.0 X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=X6ofwtzaPNoZu59J/JHRxv14EPtQuFvxrci0ghWNp6Q=; b=u+ZQVN8b/M4IHTTOKtmUQDYaT BAsmbQeFTu030/UficpaTRZ51NG4U91uNxdg0jTrrSGt4zhEKs2TEg11Q6kzu+2/yFLlzwbVduqAP xgrWE7fdQiDvASO0rwSjsyGLSgwORk/ghtHbnIQWKy0aKDW3Xa306MzfWQ4tYpl3MGXus=; 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: Linux Next Mailing List , 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/powerplay/inc/amdgpu_smu.h between commit: 03dce35deb8575 ("drm/amd/powerplay: remove duplicate macro smu_get_uclk_dpm_states in amdgpu_smu.h") from the amdgpu tree and commit: eee3258e8f8be8 ("drm/amd/powerplay: add the interface for getting ultimate frequency v3") 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/amd/powerplay/inc/amdgpu_smu.h @@@ -907,10 -746,14 +746,10 @@@ struct smu_func ((smu)->funcs->register_irq_handler ? (smu)->funcs->register_irq_handler(smu) : 0) #define smu_set_azalia_d3_pme(smu) \ ((smu)->funcs->set_azalia_d3_pme ? (smu)->funcs->set_azalia_d3_pme((smu)) : 0) + #define smu_get_dpm_ultimate_freq(smu, param, min, max) \ + ((smu)->funcs->get_dpm_ultimate_freq ? (smu)->funcs->get_dpm_ultimate_freq((smu), (param), (min), (max)) : 0) -#define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \ - ((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0) #define smu_get_max_sustainable_clocks_by_dc(smu, max_clocks) \ ((smu)->funcs->get_max_sustainable_clocks_by_dc ? (smu)->funcs->get_max_sustainable_clocks_by_dc((smu), (max_clocks)) : 0) --#define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \ -- ((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0) #define smu_baco_is_support(smu) \ ((smu)->funcs->baco_is_support? (smu)->funcs->baco_is_support((smu)) : false) #define smu_baco_get_state(smu, state) \ diff --cc drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h index a78b2e2958950,320ac20146fd1..0000000000000 --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h