gpu: nvgpu: prepare MCLK/GPCLK enumeration change

GPC2CLK has been replaced with GPCCLK on user API.
Remove related definition from kernel API.
GPCLCK and MCLK are currently assigned EQU values in kernel API.
We want to move to a simple enumeration as used in nvrm_gpu.
During the transition, an alias value will be defined for each
clock, and kernel will accept both.

Jira DNVGPU-210
Jira DNVGPU-211

Change-Id: I944fe78be9f810279f7a69964be7cda9b9c8d40d
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: http://git-master/r/1292593
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Thomas Fleury
2017-01-20 16:05:14 -08:00
committed by mobile promotions
parent db41ae567c
commit d2de17bfb0
4 changed files with 98 additions and 56 deletions

View File

@@ -537,14 +537,12 @@ struct nvgpu_gpu_alloc_vidmem_args {
};
};
/* Main graphics core clock */
#define NVGPU_GPU_CLK_DOMAIN_GPCCLK (0x10000000)
/* Memory clock */
#define NVGPU_GPU_CLK_DOMAIN_MCLK (0x00000010)
/* Main graphics core clock x 2
* deprecated, use NVGPU_GPU_CLK_DOMAIN_GPCCLK instead
*/
#define NVGPU_GPU_CLK_DOMAIN_GPC2CLK (0x00010000)
#define NVGPU_GPU_CLK_DOMAIN_MCLK (0)
#define NVGPU_GPU_CLK_DOMAIN_MCLK_ALIAS (0x00000010)
/* Main graphics core clock */
#define NVGPU_GPU_CLK_DOMAIN_GPCCLK (1)
#define NVGPU_GPU_CLK_DOMAIN_GPCCLK_ALIAS (0x10000000)
struct nvgpu_gpu_clk_range {