From d2de17bfb0eb24ac020e2dfa3ce0dd4f9d0332f9 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Fri, 20 Jan 2017 16:05:14 -0800 Subject: 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 Reviewed-on: http://git-master/r/1292593 Reviewed-by: mobile promotions Tested-by: mobile promotions --- include/uapi/linux/nvgpu.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index f5c70f2d..1dce8803 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h @@ -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 { -- cgit v1.2.2