diff options
Diffstat (limited to 'drivers/gpu/nvgpu/clk')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vf_point.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vf_point.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 0189bd8c..8333b2b0 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -200,7 +200,8 @@ static u32 _clk_vf_point_pmudatainit_volt(struct gk20a *g, | |||
200 | ppmudata; | 200 | ppmudata; |
201 | 201 | ||
202 | pset->source_voltage_uv = pclk_vf_point_volt->source_voltage_uv; | 202 | pset->source_voltage_uv = pclk_vf_point_volt->source_voltage_uv; |
203 | pset->freq_delta_khz = pclk_vf_point_volt->freq_delta_khz; | 203 | pset->freq_delta.data = pclk_vf_point_volt->freq_delta.data; |
204 | pset->freq_delta.type = pclk_vf_point_volt->freq_delta.type; | ||
204 | 205 | ||
205 | return status; | 206 | return status; |
206 | } | 207 | } |
@@ -257,6 +258,7 @@ static u32 clk_vf_point_construct_volt(struct gk20a *g, | |||
257 | _clk_vf_point_pmudatainit_volt; | 258 | _clk_vf_point_pmudatainit_volt; |
258 | 259 | ||
259 | pclkvfpoint->source_voltage_uv = ptmpvfpoint->source_voltage_uv; | 260 | pclkvfpoint->source_voltage_uv = ptmpvfpoint->source_voltage_uv; |
261 | pclkvfpoint->freq_delta = ptmpvfpoint->freq_delta; | ||
260 | 262 | ||
261 | return status; | 263 | return status; |
262 | } | 264 | } |
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h index 9a4eec10..b67434b7 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.h +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -46,7 +46,7 @@ struct clk_vf_point { | |||
46 | struct clk_vf_point_volt { | 46 | struct clk_vf_point_volt { |
47 | struct clk_vf_point super; | 47 | struct clk_vf_point super; |
48 | u32 source_voltage_uv; | 48 | u32 source_voltage_uv; |
49 | int freq_delta_khz; | 49 | struct ctrl_clk_freq_delta freq_delta; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | struct clk_vf_point_freq { | 52 | struct clk_vf_point_freq { |