From patchwork Thu Nov 12 06:18:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 7599921 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B74D9F392 for ; Thu, 12 Nov 2015 06:20:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB681207D9 for ; Thu, 12 Nov 2015 06:20:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D11C5207E9 for ; Thu, 12 Nov 2015 06:20:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E9B477A134; Wed, 11 Nov 2015 22:19:39 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 944367A082 for ; Wed, 11 Nov 2015 22:19:28 -0800 (PST) Received: by qgea14 with SMTP id a14so40618601qge.0 for ; Wed, 11 Nov 2015 22:19:28 -0800 (PST) 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=kfWpSi7ubhUQdrVm5byGmH7/9U5R0C9uHwhpY1pRSTQ=; b=NJ2ViXHcuqedSK6fqdMREixeqvw6To0sSf4PUuouuPyibrRzq+AGUCUxKyTDRf4kKu ipqLY2u1yl7z1KHs+FRY/HqnpuOh8q6K5ltgv60CjvCN9VCiExvwAxjrf51XMJnVwPiY d4R2X82KCpD1IgbewCJSPwKfGztZhBV6ET79h84fWZyoe9w9h3PUYWbyW4vtxshap9dz xCmECTEgDxWx6ebuO9mz7dg+pd4bz7gcXX6bc2TMNz5xM2q3aWwf51M0dfHxTxLb8mcN xp76GryL+tOc674xkAZ9cyL/YAsx9/d3OPwinz0F38cssPWk8aXlcNP8ZyxRRbRbsme0 Zr3g== X-Received: by 10.140.85.175 with SMTP id n44mr14350745qgd.65.1447309167954; Wed, 11 Nov 2015 22:19:27 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id 202sm3693748qhc.49.2015.11.11.22.19.27 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Nov 2015 22:19:27 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 48/51] drm/amd/powerplay: refine the logic of whether need to update power state. Date: Thu, 12 Nov 2015 01:18:38 -0500 Message-Id: <1447309121-2480-49-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1447309121-2480-1-git-send-email-alexander.deucher@amd.com> References: <1447309121-2480-1-git-send-email-alexander.deucher@amd.com> Cc: Rex Zhu 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-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rex Zhu Better handle power state changes. Signed-off-by: Rex Zhu Reviewed-by: Alex Deucher Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 13 ++++++++++--- drivers/gpu/drm/amd/powerplay/eventmgr/psm.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c index 08b75bd..82774ac 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.c @@ -86,9 +86,10 @@ int psm_set_performance_states(struct pp_eventmgr *eventmgr, unsigned long *stat int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip) { - const struct pp_power_state *pcurrent; - struct pp_power_state *requested; + struct pp_power_state *pcurrent; + struct pp_power_state *requested; struct pp_hwmgr *hwmgr; + bool equal; if (skip) return 0; @@ -97,7 +98,13 @@ int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip) pcurrent = hwmgr->current_ps; requested = hwmgr->request_ps; - if ((pcurrent != NULL || requested != NULL) && (pcurrent != requested)) { + if (requested == NULL) + return 0; + + if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr, &pcurrent->hardware, &requested->hardware, &equal))) + equal = false; + + if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) { phm_apply_state_adjust_rules(hwmgr, requested, pcurrent); phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware); hwmgr->current_ps = requested; diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h index 15abfac..1380470 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/psm.h @@ -25,6 +25,7 @@ #include "eventmanagement.h" #include "eventmanager.h" #include "power_state.h" +#include "hardwaremanager.h" int psm_get_ui_state(struct pp_eventmgr *eventmgr, enum PP_StateUILabel ui_label, unsigned long *state_id);