summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorSami Kiminki <skiminki@nvidia.com>2013-12-30 10:10:58 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:09:30 -0400
commit5f4300b36409c386a29b29f560679a5e346259a0 (patch)
tree6bd64cd19ff0e7e7eeb884c4d90a79bf764dd12f /drivers/gpu
parent106dd9cd57e0147328fcd5ea0898f6ac0f9d3db7 (diff)
video: tegra: host: gk20a: GM20B characteristics
This patch adds initial support for GM20B for GPU characteristics IOCTL. Bug 1392902 Change-Id: I55bfb7e087244eae1462d44319bd91c7c0901c2e Signed-off-by: Sami Kiminki <skiminki@nvidia.com> Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/359227 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c5
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 97649b19..0dc0dca5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1625,6 +1625,11 @@ static u32 gk20a_determine_L2_size_bytes(struct gk20a *g)
1625 bytes_per_line = 128; 1625 bytes_per_line = 128;
1626 break; 1626 break;
1627 1627
1628 case GK20A_GPUID_GM20B:
1629 lts_per_ltc = 2;
1630 bytes_per_line = 128;
1631 break;
1632
1628 default: 1633 default:
1629 dev_err(dev_from_gk20a(g), "Unknown GPU id 0x%02x\n", 1634 dev_err(dev_from_gk20a(g), "Unknown GPU id 0x%02x\n",
1630 (unsigned)gpuid); 1635 (unsigned)gpuid);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 48b0f0a6..b8de8744 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -567,6 +567,9 @@ gk20a_request_firmware(struct gk20a *g, const char *fw_name);
567#define GK20A_GPUID_GK20A \ 567#define GK20A_GPUID_GK20A \
568 GK20A_GPUID(NVHOST_GPU_ARCH_GK100, NVHOST_GPU_IMPL_GK20A) 568 GK20A_GPUID(NVHOST_GPU_ARCH_GK100, NVHOST_GPU_IMPL_GK20A)
569 569
570#define GK20A_GPUID_GM20B \
571 GK20A_GPUID(NVHOST_GPU_ARCH_GM200, NVHOST_GPU_IMPL_GM20B)
572
570int gk20a_init_gpu_characteristics(struct gk20a *g); 573int gk20a_init_gpu_characteristics(struct gk20a *g);
571 574
572#endif /* _NVHOST_GK20A_H_ */ 575#endif /* _NVHOST_GK20A_H_ */