From 687b1059f078daf41024b223065107bc16822e71 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 13 Apr 2018 14:44:31 -0700 Subject: gpu: nvgpu: save max_comptag_lines in gr max_comptag_lines will be used by RM server to calculate how many lines each guest can get. Jira VQRM-2345 Change-Id: If52208d79617f2f894e48d3a4daec186fda862f1 Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1695082 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 1 + drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 3 ++- drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 1 + drivers/gpu/nvgpu/vgpu/ltc_vgpu.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 79afbf0c..be149b73 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h @@ -339,6 +339,7 @@ struct gr_gk20a { u32 num_fbps; + u32 max_comptag_lines; u32 comptags_per_cacheline; u32 slices_per_ltc; u32 cacheline_size; diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 0d9fd560..dcb65372 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c @@ -1,7 +1,7 @@ /* * GM20B L2 * - * Copyright (c) 2014-2017 NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2018 NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -100,6 +100,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) if (err) return err; + gr->max_comptag_lines = max_comptag_lines; gr->comptags_per_cacheline = comptags_per_cacheline; gr->slices_per_ltc = slices_per_ltc; gr->cacheline_size = cacheline_size; diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index d6634b14..71764a7c 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c @@ -124,6 +124,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) if (err) return err; + gr->max_comptag_lines = max_comptag_lines; gr->comptags_per_cacheline = comptags_per_cacheline; gr->slices_per_ltc = slices_per_ltc; gr->cacheline_size = cacheline_size; diff --git a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c b/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c index 7e86ba38..d451a1f2 100644 --- a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c @@ -56,6 +56,8 @@ int vgpu_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) if (err) return err; + gr->max_comptag_lines = max_comptag_lines; + return 0; } -- cgit v1.2.2