From patchwork Thu Nov 12 06:18:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 7599841 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 A5B6D9F392 for ; Thu, 12 Nov 2015 06:20:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FA71207DD for ; Thu, 12 Nov 2015 06:20:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 62425207D0 for ; Thu, 12 Nov 2015 06:20:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0ABC7A0FE; Wed, 11 Nov 2015 22:19:29 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com [209.85.192.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA33D7A114 for ; Wed, 11 Nov 2015 22:19:24 -0800 (PST) Received: by qgec40 with SMTP id c40so40609730qge.2 for ; Wed, 11 Nov 2015 22:19:24 -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=n2iTy34e7T3nDHe0ZmMa+dB5h8ii541hrcWdhDGjf24=; b=Va6iX7cmhksuq7jVRkElRYShJpgzod/RzUzK92HY8IFwSXaX+DaOXNpRy56qkir1k9 n1Y6GcSQcOypvkwCXBuqgtoEwfZ6l0qUM6LtUQnKgysDIflLngMcZ/OZPgnm265pDPpd nOZp52WQewlZQiHxhE7/P5ncty5pYkZLtJX8ty+jtDP1Bka08wklS2N9cEBBn2Z+btVa JUiZSbPmIBMUK0N6hWDStK3S2F/6GXNhtC4EVj1IlxL2JAZ/Oe7kbXnmwI807jB/BiC7 F2uZGw2LZ8nQDheUlcVbnftCDqbu01iABiiVGicOFC4bvMz6t3lhW12cCVvNTRYO3jXn rfjw== X-Received: by 10.140.99.6 with SMTP id p6mr14160595qge.76.1447309163963; Wed, 11 Nov 2015 22:19:23 -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.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Nov 2015 22:19:23 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 40/51] drm/amdgpu/powerplay: enable thermal interrupt task in eventmgr. Date: Thu, 12 Nov 2015 01:18:30 -0500 Message-Id: <1447309121-2480-41-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 Add thermal handling to the event manager. Signed-off-by: Rex Zhu Reviewed-by: Jammy Zhou Reviewed-by: Alex Deucher --- .../gpu/drm/amd/powerplay/eventmgr/eventactionchains.c | 1 + drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 17 ++++++++++++++++- .../gpu/drm/amd/powerplay/eventmgr/eventsubchains.c | 10 ++++++++++ .../gpu/drm/amd/powerplay/eventmgr/eventsubchains.h | 3 ++- drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 18 ++++++++++++++++-- drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h | 3 +++ 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c index e9fe85f..bbbb76c 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c @@ -33,6 +33,7 @@ static const pem_event_action *initialize_event[] = { enable_clock_power_gatings_tasks, get_2d_performance_state_tasks, set_performance_state_tasks, + initialize_thermal_controller_tasks, conditionally_force_3d_performance_state_tasks, process_vbios_eventinfo_tasks, broadcast_power_policy_tasks, diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c index 0438442..d5ec8cc 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c @@ -22,6 +22,8 @@ */ #include "eventmgr.h" #include "eventinit.h" +#include "ppinterrupt.h" +#include "hardwaremanager.h" void pem_init_feature_info(struct pp_eventmgr *eventmgr) { @@ -145,12 +147,25 @@ void pem_init_feature_info(struct pp_eventmgr *eventmgr) eventmgr->features[PP_Feature_ViPG].enabled = false; } +static int thermal_interrupt_callback(void *private_data, + unsigned src_id, const uint32_t *iv_entry) +{ + /* TO DO hanle PEM_Event_ThermalNotification (struct pp_eventmgr *)private_data*/ + printk("current thermal is out of range \n"); + return 0; +} + int pem_register_interrupts(struct pp_eventmgr *eventmgr) { int result = 0; + struct pp_interrupt_registration_info info; + + info.call_back = thermal_interrupt_callback; + info.context = eventmgr; + + result = phm_register_thermal_interrupt(eventmgr->hwmgr, &info); /* TODO: - * 1. Register thermal events interrupt * 2. Register CTF event interrupt * 3. Register for vbios events interrupt * 4. Register External Throttle Interrupt diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c index e5dd86d..3dd671e 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c @@ -393,3 +393,13 @@ const pem_event_action create_new_user_performance_state_tasks[] = { pem_task_create_user_performance_state, NULL }; + +const pem_event_action initialize_thermal_controller_tasks[] = { + pem_task_initialize_thermal_controller, + NULL +}; + +const pem_event_action uninitialize_thermal_controller_tasks[] = { + pem_task_uninitialize_thermal_controller, + NULL +}; diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h index 27e0e61..741ebfc 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h @@ -94,5 +94,6 @@ extern const pem_event_action enable_stutter_mode_tasks[]; extern const pem_event_action enable_disable_bapm_tasks[]; extern const pem_event_action reset_boot_state_tasks[]; extern const pem_event_action create_new_user_performance_state_tasks[]; - +extern const pem_event_action initialize_thermal_controller_tasks[]; +extern const pem_event_action uninitialize_thermal_controller_tasks[]; #endif /* _EVENT_SUB_CHAINS_H_ */ diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c index 8ca3280..fdd67c6 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c @@ -32,6 +32,9 @@ #include "amd_powerplay.h" #include "psm.h" +#define TEMP_RANGE_MIN (90 * 1000) +#define TEMP_RANGE_MAX (120 * 1000) + int pem_task_update_allowed_performance_levels(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) { @@ -104,8 +107,6 @@ int pem_task_unregister_interrupts(struct pp_eventmgr *eventmgr, struct pem_even return pem_unregister_interrupts(eventmgr); } - - int pem_task_get_boot_state_id(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) { int result; @@ -415,3 +416,16 @@ restart_search: return -1; } +int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) +{ + struct PP_TemperatureRange range; + range.max = TEMP_RANGE_MAX; + range.min = TEMP_RANGE_MIN; + + return phm_start_thermal_controller(eventmgr->hwmgr, &range); +} + +int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data) +{ + return phm_stop_thermal_controller(eventmgr->hwmgr); +} \ No newline at end of file diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h index 287c87c..6c6297e 100644 --- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h +++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h @@ -81,5 +81,8 @@ int pem_task_conditionally_force_3d_performance_state(struct pp_eventmgr *eventm int pem_task_get_2D_performance_state_id(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); int pem_task_create_user_performance_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); int pem_task_update_allowed_performance_levels(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); +/*thermal */ +int pem_task_initialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); +int pem_task_uninitialize_thermal_controller(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data); #endif /* _EVENT_TASKS_H_ */