From patchwork Fri Jun 3 23:03:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9154263 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 6FD056082E for ; Fri, 3 Jun 2016 23:04:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61E8F28346 for ; Fri, 3 Jun 2016 23:04:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56AC628349; Fri, 3 Jun 2016 23:04: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=-3.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FB3E28346 for ; Fri, 3 Jun 2016 23:04:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2063D6E5B3; Fri, 3 Jun 2016 23:03:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 520096E5AB for ; Fri, 3 Jun 2016 23:03:53 +0000 (UTC) Received: by mail-io0-x242.google.com with SMTP id k19so12687059ioi.2 for ; Fri, 03 Jun 2016 16:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wG2wj7KWJhNO+Vz07jFxWX0CMkQ/3o7dQhmKVjfKKQU=; b=NmsbC8LEnVp2uNnixZshbg+33p4adFYFNZ6SRkR3bUIHaj+p5CgQut/hP87pHlOqhe ewP5YwpW4LPR25qvOuOb+GUX5dCsFia46RoMcT+Jib8eLfbrkDZnUFETujO7v+k1toow eskZoGV/ecAzUOmBhqMw1c2+hsmi7zDzih3MRzESxNw1n0ZNYe1ev07c5TrdsVLcNLm1 7UJZAL0WmLnNZw9nXmEfvTZSnQ/zpcB9O0twS+Bqqp6Tz4+TycsoTLDtaQeeblsNrZcn y0NXU9oKI8+uwHS+vLSD+7FkcI3CdshnJ9IMiSc0HvJOMfsKekgYy7rDj1nigL2lbXME bnmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wG2wj7KWJhNO+Vz07jFxWX0CMkQ/3o7dQhmKVjfKKQU=; b=JNcuxZkarF3kUvZ11wnnIdZoitrUyJjMTQuruAa79iZtQoAgXkZAGHyX1UAmus1hB/ kpzFRTFqv9WSY5Wp6w85I4Bo1X4D1MRHEnGdO4FYFe9siybpmNUPyDale2GQvshx0B03 Ml8NGTDkR/TLtP9ZBXYV6xumcGws0SyQaJ8qVCITha6YRtxYBhH+0opSMUIibflopPR0 5lVoam7LANHdbtwjRYGqG3AYI6ZFgt7Hj5KAvzvVMNa9yimS9C0ZCuQRky5ygnPvqMTD CHPhLYVjxQDftb3dNf3fuXgt8PwZ9KyxdCQzNL6IWphAk8dvSk4v1ODS6R55kTQxuJe2 kP3Q== X-Gm-Message-State: ALyK8tIYajBg2kJ4Bcql7nLDqBPqLQra9YeQdHg15/rH7fJluS/G9QIBeRNV+mnT9IAYqg== X-Received: by 10.36.222.137 with SMTP id d131mr3037362itg.4.1464995032335; Fri, 03 Jun 2016 16:03:52 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id o206sm808156itg.9.2016.06.03.16.03.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Jun 2016 16:03:51 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/amdgpu/gfx80: Add QUICK_PG bit to GFX header and use it. Date: Fri, 3 Jun 2016 19:03:45 -0400 Message-Id: <1464995025-25677-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464995025-25677-1-git-send-email-alexander.deucher@amd.com> References: <1464995025-25677-1-git-send-email-alexander.deucher@amd.com> Cc: Tom St Denis , Alex Deucher 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: Tom St Denis Signed-off-by: Tom St Denis Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++-- drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 97862d3..4e34877 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -5291,9 +5291,9 @@ static void polaris11_enable_gfx_quick_mg_power_gating(struct amdgpu_device *ade temp = data = RREG32(mmRLC_PG_CNTL); /* Enable quick PG */ if (enable) - data |= 0x100000; + data |= RLC_PG_CNTL__QUICK_PG_ENABLE_MASK; else - data &= ~0x100000; + data &= ~RLC_PG_CNTL__QUICK_PG_ENABLE_MASK; if (temp != data) WREG32(mmRLC_PG_CNTL, data); diff --git a/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h index 7d72245..64a1953 100644 --- a/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h +++ b/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h @@ -8764,8 +8764,10 @@ #define RLC_PG_CNTL__SMU_CLK_SLOWDOWN_ON_PD_ENABLE__SHIFT 0x12 #define RLC_PG_CNTL__SMU_HANDSHAKE_ENABLE_MASK 0x80000 #define RLC_PG_CNTL__SMU_HANDSHAKE_ENABLE__SHIFT 0x13 -#define RLC_PG_CNTL__RESERVED1_MASK 0xf00000 -#define RLC_PG_CNTL__RESERVED1__SHIFT 0x14 +#define RLC_PG_CNTL__QUICK_PG_ENABLE_MASK 0x100000 +#define RLC_PG_CNTL__QUICK_PG_ENABLE__SHIFT 0x14 +#define RLC_PG_CNTL__RESERVED1_MASK 0xe00000 +#define RLC_PG_CNTL__RESERVED1__SHIFT 0x15 #define RLC_GPM_THREAD_PRIORITY__THREAD0_PRIORITY_MASK 0xff #define RLC_GPM_THREAD_PRIORITY__THREAD0_PRIORITY__SHIFT 0x0 #define RLC_GPM_THREAD_PRIORITY__THREAD1_PRIORITY_MASK 0xff00