From 13ca1676ef9c43b137b0ca55e8143da9fa4b5032 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 23 Oct 2014 15:35:27 +0300 Subject: gpu: nvgpu: Split L2 size calculation per chip gk20a and gm20b calculate L2 size with different parameters. Split the function for calculating size so that it does not query GPU id. Bug 1567274 Change-Id: I09510c1bf0286c9df125d74e51df322c32bde646 Signed-off-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/ltc_common.c | 59 ------------------------------------ 1 file changed, 59 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/ltc_common.c') diff --git a/drivers/gpu/nvgpu/gk20a/ltc_common.c b/drivers/gpu/nvgpu/gk20a/ltc_common.c index 9d534b7b..e0ab3f9b 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_common.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_common.c @@ -24,65 +24,6 @@ #include "gk20a.h" #include "gr_gk20a.h" -static int gk20a_determine_L2_size_bytes(struct gk20a *g) -{ - const u32 gpuid = GK20A_GPUID(g->gpu_characteristics.arch, - g->gpu_characteristics.impl); - u32 lts_per_ltc; - u32 ways; - u32 sets; - u32 bytes_per_line; - u32 active_ltcs; - u32 cache_size; - - u32 tmp; - u32 active_sets_value; - - tmp = gk20a_readl(g, ltc_ltc0_lts0_tstg_cfg1_r()); - ways = hweight32(ltc_ltc0_lts0_tstg_cfg1_active_ways_v(tmp)); - - active_sets_value = ltc_ltc0_lts0_tstg_cfg1_active_sets_v(tmp); - if (active_sets_value == ltc_ltc0_lts0_tstg_cfg1_active_sets_all_v()) { - sets = 64; - } else if (active_sets_value == - ltc_ltc0_lts0_tstg_cfg1_active_sets_half_v()) { - sets = 32; - } else if (active_sets_value == - ltc_ltc0_lts0_tstg_cfg1_active_sets_quarter_v()) { - sets = 16; - } else { - dev_err(dev_from_gk20a(g), - "Unknown constant %u for active sets", - (unsigned)active_sets_value); - sets = 0; - } - - active_ltcs = g->gr.num_fbps; - - /* chip-specific values */ - switch (gpuid) { - case GK20A_GPUID_GK20A: - lts_per_ltc = 1; - bytes_per_line = 128; - break; - - case GK20A_GPUID_GM20B: - lts_per_ltc = 2; - bytes_per_line = 128; - break; - - default: - dev_err(dev_from_gk20a(g), "Unknown GPU id 0x%02x\n", - (unsigned)gpuid); - lts_per_ltc = 0; - bytes_per_line = 0; - } - - cache_size = active_ltcs * lts_per_ltc * ways * sets * bytes_per_line; - - return cache_size; -} - /* * Set the maximum number of ways that can have the "EVIST_LAST" class. */ -- cgit v1.2.2