From cc4208a27831faf95409b491aa29b8a161bf630a Mon Sep 17 00:00:00 2001 From: Shardar Shariff Md Date: Tue, 1 Nov 2016 19:06:06 +0530 Subject: gpu: nvgpu: define fuse macro depend on kernel version - Define fuse macros depending on kernel version as fuse offset got changed in K4.4 and for K4.4 fuse defines are defined in common header file (tegra-fuse.h) - Use fuse control read/write APIs when reading control registers for K4.4. Bug 200243956 Change-Id: I5a86ef58d9de17a273aea8d3ce8ad5772444dac2 Signed-off-by: Shardar Shariff Md Reviewed-on: http://git-master/r/1245824 Reviewed-by: Deepak Nibade Reviewed-by: Konsta Holtta Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gm20b/gr_gm20b.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/gpu/nvgpu/gm20b/gr_gm20b.h') diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h index fc52f223..fd24d105 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h @@ -15,6 +15,9 @@ #ifndef _NVHOST_GM20B_GR_MMU_H #define _NVHOST_GM20B_GR_MMU_H + +#include + struct gk20a; enum { @@ -31,10 +34,12 @@ enum { #define CLK_RST_CONTROLLER_MISC_CLK_ENB_0 0x48 #define CLK_RST_CONTROLLER_MISC_CLK_ENB_0_ALL_VISIBLE BIT(28) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) #define FUSE_FUSEBYPASS_0 0x24 #define FUSE_WRITE_ACCESS_SW_0 0x30 #define FUSE_OPT_GPU_TPC0_DISABLE_0 0x30C #define FUSE_OPT_GPU_TPC1_DISABLE_0 0x33C +#endif #define NVB197_SET_ALPHA_CIRCULAR_BUFFER_SIZE 0x02dc #define NVB197_SET_CIRCULAR_BUFFER_SIZE 0x1280 -- cgit v1.2.2