From patchwork Fri Jun 23 16:35:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9806923 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 780D960349 for ; Fri, 23 Jun 2017 16:36:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 676EE28524 for ; Fri, 23 Jun 2017 16:36:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BD5E2879F; Fri, 23 Jun 2017 16:36:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9C93028524 for ; Fri, 23 Jun 2017 16:35:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B61CE6E7D9; Fri, 23 Jun 2017 16:35:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A2C66E7CA; Fri, 23 Jun 2017 16:35:22 +0000 (UTC) Received: by mail-qk0-x244.google.com with SMTP id r62so6844126qkf.3; Fri, 23 Jun 2017 09:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ctc2vgxoqk5WU7hmpxWMpJjfITLnG/M8em+SjkHuPHk=; b=ONWHzTs522rgtZBCwdKykgu3lXUDQBaVWr4VM4zS+EmtmCXFe/CPm+rvmy4nhmnqTo O1E+qRwR1F/ceDMsHUue+tV4qavGcsHkef5OK9ViBIVVBYhMuoAFs67VQNsU0opkuRxQ gLNR5Z4x94rdtTAUMonPXndLKs4T3EwHMdwXEbR5biyrfIAJZMjD/YMAdihJA2y70KZB 3KNT7NZBcIaKTP605mc4Dxkdeim/+f7ieIRsPy4nbwL8xAFsQPnnmXH9tq6rFUU2n0bb n3XGkDAkPo64zgg1DggEXljKesXAeOU7FVcweQGU8VbxCjrZ7E9SMWCuTg7Ou99Y7R7T 0suA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ctc2vgxoqk5WU7hmpxWMpJjfITLnG/M8em+SjkHuPHk=; b=gR6YW89ck4l6Kty7RUsIZgrSuvr1w2XxyFPSYKtv05nGbCcWUrU0zfFXJfqDiA5mlv ze0tZZD8gDbq/gAXiVTxcSzkoQCa0d/aCuKF6cywuVHiXXcyAs4pB3OYc3TcIR0gftk3 FRWAMj20/CQOPiXiNxeyRKUFrL4WRw80Fp6VcyREKCABOUGSpCtOoYoyz7exq82Rrw0/ oF+a8tUFGyoOSWq+rGng044EeGuzz8ECqypfs/3WCVC11zW/cLtWH0EwG8dHWMcX46gx bjV87+IKA71nYviCYnrx1niNqG0F9UNkTy+yOeBzc2Vdum9qujiNWrG6+QIgty0/+PSW hZ/Q== X-Gm-Message-State: AKS2vOwtfrVEoAKMMHQXZOj8eVtzx1+NayuXLrvPARefZzndn2zAryCf YVTSX6m73wzdZv7k X-Received: by 10.55.46.2 with SMTP id u2mr10887737qkh.23.1498235721029; Fri, 23 Jun 2017 09:35:21 -0700 (PDT) Received: from cm.localdomain (va-67-76-166-195.sta.embarqhsd.net. [67.76.166.195]) by smtp.gmail.com with ESMTPSA id 5sm3793284qkr.27.2017.06.23.09.35.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 09:35:20 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, alsa-devel@alsa-project.org, airlied@gmail.com, broonie@kernel.org, Vijendar.Mukunda@amd.com, rajeevkumar.linux@gmail.com Subject: [PATCH 7/8] drm/amd/amdgpu: Disable ACP Power Gating for Stoney platform Date: Fri, 23 Jun 2017 12:35:05 -0400 Message-Id: <1498235706-31111-8-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1498235706-31111-1-git-send-email-alexander.deucher@amd.com> References: <1498235706-31111-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher , lgirdwood@gmail.com, perex@perex.cz X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Vijendar Mukunda Power Gating is disabled in Stoney platform. Reviewed-by: Alex Deucher Signed-off-by: Vijendar Mukunda Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c index 86b68f7..0e512fa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c @@ -287,19 +287,20 @@ static int acp_hw_init(void *handle) return 0; else if (r) return r; + if (asic_type != CHIP_STONEY) { + adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain), GFP_KERNEL); + if (adev->acp.acp_genpd == NULL) + return -ENOMEM; - adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain), GFP_KERNEL); - if (adev->acp.acp_genpd == NULL) - return -ENOMEM; - - adev->acp.acp_genpd->gpd.name = "ACP_AUDIO"; - adev->acp.acp_genpd->gpd.power_off = acp_poweroff; - adev->acp.acp_genpd->gpd.power_on = acp_poweron; + adev->acp.acp_genpd->gpd.name = "ACP_AUDIO"; + adev->acp.acp_genpd->gpd.power_off = acp_poweroff; + adev->acp.acp_genpd->gpd.power_on = acp_poweron; - adev->acp.acp_genpd->cgs_dev = adev->acp.cgs_device; + adev->acp.acp_genpd->cgs_dev = adev->acp.cgs_device; - pm_genpd_init(&adev->acp.acp_genpd->gpd, NULL, false); + pm_genpd_init(&adev->acp.acp_genpd->gpd, NULL, false); + } adev->acp.acp_cell = kzalloc(sizeof(struct mfd_cell) * ACP_DEVS, GFP_KERNEL); @@ -388,12 +389,14 @@ static int acp_hw_init(void *handle) if (r) return r; - for (i = 0; i < ACP_DEVS ; i++) { - dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i); - r = pm_genpd_add_device(&adev->acp.acp_genpd->gpd, dev); - if (r) { - dev_err(dev, "Failed to add dev to genpd\n"); - return r; + if (asic_type != CHIP_STONEY) { + for (i = 0; i < ACP_DEVS ; i++) { + dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i); + r = pm_genpd_add_device(&adev->acp.acp_genpd->gpd, dev); + if (r) { + dev_err(dev, "Failed to add dev to genpd\n"); + return r; + } } }