summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2017-11-30 09:50:38 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-12-01 02:53:31 -0500
commit5e9f4bbf8ddff9fbe060839a60dcc2168ca3d57c (patch)
treec798474d5a6676b54526ad1168722bd29ce0a0a4 /drivers/gpu
parentd73ad6c07da23636c00c60effeeb53ea35847ee8 (diff)
gpu: nvgpu: remove linux dependent from pmu_gk20a.c
- Removed Linux dependent header - Moved thermal alarm post from pmu_gk20a.c to clk_arb.c - Implemented nvgpu_clk_arb_send_thermal_alaram() method to post NVGPU_GPU_EVENT_ALARM_THERMAL_ABOVE_THRESHOLD JIRA NVGPU-403 Change-Id: Ibf85c2f3a6e704fdcc0502745fab820f7ea428f4 Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1608313 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/nvgpu/common/linux/clk_arb.c6
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c5
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/clk_arb.h2
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/clk_arb.c b/drivers/gpu/nvgpu/common/linux/clk_arb.c
index 95042389..82c97891 100644
--- a/drivers/gpu/nvgpu/common/linux/clk_arb.c
+++ b/drivers/gpu/nvgpu/common/linux/clk_arb.c
@@ -423,6 +423,12 @@ mutex_fail:
423 return err; 423 return err;
424} 424}
425 425
426void nvgpu_clk_arb_send_thermal_alarm(struct gk20a *g)
427{
428 nvgpu_clk_arb_schedule_alarm(g,
429 (0x1UL << NVGPU_GPU_EVENT_ALARM_THERMAL_ABOVE_THRESHOLD));
430}
431
426void nvgpu_clk_arb_schedule_alarm(struct gk20a *g, u32 alarm) 432void nvgpu_clk_arb_schedule_alarm(struct gk20a *g, u32 alarm)
427{ 433{
428 struct nvgpu_clk_arb *arb = g->clk_arb; 434 struct nvgpu_clk_arb *arb = g->clk_arb;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 4e3eeb51..f9f85219 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -22,8 +22,6 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
27#include <nvgpu/nvgpu_common.h> 25#include <nvgpu/nvgpu_common.h>
28#include <nvgpu/timers.h> 26#include <nvgpu/timers.h>
29#include <nvgpu/kmem.h> 27#include <nvgpu/kmem.h>
@@ -590,8 +588,7 @@ int nvgpu_pmu_handle_therm_event(struct nvgpu_pmu *pmu,
590 switch (msg->msg_type) { 588 switch (msg->msg_type) {
591 case NV_PMU_THERM_MSG_ID_EVENT_HW_SLOWDOWN_NOTIFICATION: 589 case NV_PMU_THERM_MSG_ID_EVENT_HW_SLOWDOWN_NOTIFICATION:
592 if (msg->hw_slct_msg.mask == BIT(NV_PMU_THERM_EVENT_THERMAL_1)) 590 if (msg->hw_slct_msg.mask == BIT(NV_PMU_THERM_EVENT_THERMAL_1))
593 nvgpu_clk_arb_schedule_alarm(gk20a_from_pmu(pmu), 591 nvgpu_clk_arb_send_thermal_alarm(pmu->g);
594 (0x1UL << NVGPU_GPU_EVENT_ALARM_THERMAL_ABOVE_THRESHOLD));
595 else 592 else
596 gk20a_dbg_pmu("Unwanted/Unregistered thermal event received %d", 593 gk20a_dbg_pmu("Unwanted/Unregistered thermal event received %d",
597 msg->hw_slct_msg.mask); 594 msg->hw_slct_msg.mask);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
index 09f0b0d3..c13144ee 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
@@ -77,6 +77,8 @@ int nvgpu_clk_arb_get_current_pstate(struct gk20a *g);
77 77
78void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock); 78void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock);
79 79
80void nvgpu_clk_arb_send_thermal_alarm(struct gk20a *g);
81
80void nvgpu_clk_arb_schedule_alarm(struct gk20a *g, u32 alarm); 82void nvgpu_clk_arb_schedule_alarm(struct gk20a *g, u32 alarm);
81#endif /* __NVGPU_CLK_ARB_H__ */ 83#endif /* __NVGPU_CLK_ARB_H__ */
82 84