From de232ceb4b3bfa88650d1eed764357ba4a598076 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Mon, 31 Jul 2017 16:05:22 -0700 Subject: gpu: nvgpu: remove kind map inheritance Currently, the kind map initialization inherits from earlier chips' kind map definitions and simply adds on newly supported features. This is dangerous as changes in older architectures may affect newer architectures in unpredictable ways. This patch removes inheritance between subsequent architectures' kind map initializations. Jira NVGPU-74 Change-Id: Iab504d45b6ce2e625ed6788e62c1e7104e45c89a Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1537747 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/fb_gv11b.c | 421 +++++++++++++++++++++++++++++++++++-- 1 file changed, 405 insertions(+), 16 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/fb_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c index 51ee55f8..35227576 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c @@ -30,12 +30,11 @@ #include "gv11b/fb_gv11b.h" #include "gv11b/ce_gv11b.h" -#include #include #include #include #include - +#include static int gv11b_fb_fix_page_fault(struct gk20a *g, struct mmu_fault_info *mmfault); @@ -252,50 +251,440 @@ static const char *const gpc_client_descs_gv11b[] = { "t1 36", "t1 37", "t1 38", "t1 39", }; -static void gv11b_init_uncompressed_kind_map(void) +static noinline_for_stack void gv11b_init_uncompressed_kind_map(void) { + int i; + + for (i = 0; i < 256; i++) + gk20a_uc_kind_map[i] = gmmu_pte_kind_invalid_v(); + + /* From gv11b */ gk20a_uc_kind_map[gmmu_pte_kind_c32_ms2_4cbra_v()] = gk20a_uc_kind_map[gmmu_pte_kind_c64_ms2_4cbra_v()] = gmmu_pte_kind_generic_16bx2_v(); + + /* From gp10b */ + gk20a_uc_kind_map[gmmu_pte_kind_z16_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms2_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms4_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms8_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms16_2cz_v()] = + gmmu_pte_kind_z16_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_4cbra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_4cbra_v()] = + gmmu_pte_kind_generic_16bx2_v(); + + /* From gm20b */ + gk20a_uc_kind_map[gmmu_pte_kind_s8_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8_2s_v()] = + gmmu_pte_kind_s8_v(); + + /* From gk20a */ + gk20a_uc_kind_map[gmmu_pte_kind_z16_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms2_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms4_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms8_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_2z_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms2_2z_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms4_2z_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z16_ms8_2z_v()] = + gmmu_pte_kind_z16_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms2_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms4_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms8_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms2_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms8_2cs_v()] = + gmmu_pte_kind_s8z24_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_2zv_v()] = + gmmu_pte_kind_v8z24_ms4_vc4_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_2zv_v()] = + gmmu_pte_kind_v8z24_ms8_vc8_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_2zv_v()] = + gmmu_pte_kind_v8z24_ms4_vc12_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_2zv_v()] = + gmmu_pte_kind_v8z24_ms8_vc24_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms2_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms2_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms4_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms8_2cz_v()] = + gmmu_pte_kind_z24s8_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_zf32_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms2_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms2_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms4_2cz_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms8_2cz_v()] = + gmmu_pte_kind_zf32_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_2cszv_v()] = + gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_2cszv_v()] = + gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_2cszv_v()] = + gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cszv_v()] = + gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_2cszv_v()] = + gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_2cszv_v()] = + gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_2cszv_v()] = + gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cszv_v()] = + gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_2cszv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms2_2cszv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms4_2cszv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms8_2cszv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms2_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms8_2cs_v()] = + gmmu_pte_kind_zf32_x24s8_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_c32_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_2cba_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_2cra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_2bra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms2_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2cbr_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2cba_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2cra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2bra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms8_ms16_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c32_ms8_ms16_2cra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_2cbr_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_2cba_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_2cra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_2bra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms2_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2cbr_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2cba_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2cra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2bra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms8_ms16_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c64_ms8_ms16_2cra_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_2cr_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_ms2_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_ms2_2cr_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_ms4_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_ms4_2cr_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_ms8_ms16_2c_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_c128_ms8_ms16_2cr_v()] = + gmmu_pte_kind_generic_16bx2_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc4_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc4_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc4_2zv_v()] = + gmmu_pte_kind_z24v8_ms4_vc4_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc12_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc12_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc12_2zv_v()] = + gmmu_pte_kind_z24v8_ms4_vc12_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc8_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc8_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc8_2zv_v()] = + gmmu_pte_kind_z24v8_ms8_vc8_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc24_2czv_v()] = + gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc24_2zv_v()] = + gmmu_pte_kind_z24v8_ms8_vc24_v(); + + gk20a_uc_kind_map[gmmu_pte_kind_x8c24_v()] = + gmmu_pte_kind_x8c24_v(); +} + +static noinline_for_stack bool gv11b_kind_supported(u8 k) +{ + return /* From gv11b */ + k == gmmu_pte_kind_c32_ms2_4cbra_v() + || k == gmmu_pte_kind_c64_ms2_4cbra_v() + /* From gp10b */ + || (k >= gmmu_pte_kind_z16_2cz_v() && + k <= gmmu_pte_kind_z16_ms8_2cz_v()) + || k == gmmu_pte_kind_z16_ms16_2cz_v() + || k == gmmu_pte_kind_c32_ms4_4cbra_v() + || k == gmmu_pte_kind_c64_ms4_4cbra_v() + /* From gm20b */ + || (k == gmmu_pte_kind_smsked_message_v()) + || (k >= gmmu_pte_kind_s8_v() && + k <= gmmu_pte_kind_s8_2s_v()) + /* From gk20a */ + || gk20a_kind_work_creation(k) + || (k == gmmu_pte_kind_invalid_v()) + || (k == gmmu_pte_kind_pitch_v()) + || (k >= gmmu_pte_kind_z16_v() && + k <= gmmu_pte_kind_z16_ms8_2c_v()) + || (k >= gmmu_pte_kind_z16_2z_v() && + k <= gmmu_pte_kind_z16_ms8_2z_v()) + || (k == gmmu_pte_kind_s8z24_v()) + || (k >= gmmu_pte_kind_s8z24_2cz_v() && + k <= gmmu_pte_kind_s8z24_ms8_2cz_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_2zv_v()) + || (k == gmmu_pte_kind_z24s8_v()) + || (k >= gmmu_pte_kind_z24s8_2cz_v() && + k <= gmmu_pte_kind_z24s8_ms8_2cz_v()) + || (k == gmmu_pte_kind_zf32_v()) + || (k >= gmmu_pte_kind_zf32_2cz_v() && + k <= gmmu_pte_kind_zf32_ms8_2cz_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_v() && + k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_2cszv_v() && + k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_v()) + || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_2cszv_v() && + k <= gmmu_pte_kind_zf32_x24s8_v()) + || (k >= gmmu_pte_kind_zf32_x24s8_2cszv_v() && + k <= gmmu_pte_kind_zf32_x24s8_ms8_2cszv_v()) + || (k == gmmu_pte_kind_generic_16bx2_v()) + || (k == gmmu_pte_kind_c32_2c_v()) + || (k == gmmu_pte_kind_c32_2cra_v()) + || (k == gmmu_pte_kind_c32_ms2_2c_v()) + || (k >= gmmu_pte_kind_c32_ms4_2c_v() && + k <= gmmu_pte_kind_c32_ms4_2cbr_v()) + || (k >= gmmu_pte_kind_c32_ms4_2cra_v() && + k <= gmmu_pte_kind_c64_2c_v()) + || (k == gmmu_pte_kind_c64_2cra_v()) + || (k == gmmu_pte_kind_c64_ms2_2c_v()) + || (k >= gmmu_pte_kind_c64_ms4_2c_v() && + k <= gmmu_pte_kind_c64_ms4_2cbr_v()) + || (k >= gmmu_pte_kind_c64_ms4_2cra_v() && + k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()) + || (k == gmmu_pte_kind_pitch_no_swizzle_v()); } -static bool gv11b_kind_supported(u8 k) +static noinline_for_stack bool gv11b_kind_z(u8 k) { - return (k == gmmu_pte_kind_c32_ms2_4cbra_v() - || k == gmmu_pte_kind_c64_ms2_4cbra_v()); + return /* From gv11b */ + (k == gmmu_pte_kind_c32_ms2_4cbra_v()) + || (k == gmmu_pte_kind_c64_ms2_4cbra_v()) + /* From gp10b */ + || (k >= gmmu_pte_kind_z16_2cz_v() && + k <= gmmu_pte_kind_z16_ms8_2cz_v()) + || (k == gmmu_pte_kind_z16_ms16_2cz_v()) + /* From gm20b */ + || (k >= gmmu_pte_kind_s8_v() && + k <= gmmu_pte_kind_s8_2s_v()) + /* From gk20a */ + || (k >= gmmu_pte_kind_z16_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_1cs_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_1cs_v()) + || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_zf32_x24s8_ms16_1cs_v()); } -static bool gv11b_kind_z(u8 k) +static noinline_for_stack bool gv11b_kind_c(u8 k) { - return (k == gmmu_pte_kind_c32_ms2_4cbra_v() - || k == gmmu_pte_kind_c64_ms2_4cbra_v()); + return gk20a_kind_work_creation(k) + || (k == gmmu_pte_kind_pitch_v()) + || (k == gmmu_pte_kind_generic_16bx2_v()) + || (k >= gmmu_pte_kind_c32_2c_v() && + k <= gmmu_pte_kind_c32_ms2_2cbr_v()) + || (k >= gmmu_pte_kind_c32_ms4_2c_v() && + k <= gmmu_pte_kind_c64_ms2_2cbr_v()) + || (k >= gmmu_pte_kind_c64_ms4_2c_v() && + k <= gmmu_pte_kind_pitch_no_swizzle_v()); } -static bool gv11b_kind_compressible(u8 k) +static noinline_for_stack bool gv11b_kind_compressible(u8 k) { - return (k == gmmu_pte_kind_c32_ms2_4cbra_v() - || k == gmmu_pte_kind_c64_ms2_4cbra_v()); + return /* From gv11b */ + (k == gmmu_pte_kind_c32_ms2_4cbra_v()) + || (k == gmmu_pte_kind_c64_ms2_4cbra_v()) + /* From gp10b */ + || (k >= gmmu_pte_kind_z16_2cz_v() && + k <= gmmu_pte_kind_z16_ms8_2cz_v()) + || (k == gmmu_pte_kind_z16_ms16_2cz_v()) + || (k == gmmu_pte_kind_c32_ms4_4cbra_v()) + || (k == gmmu_pte_kind_c64_ms4_4cbra_v()) + /* From gm20b */ + || (k >= gmmu_pte_kind_s8_v() && + k <= gmmu_pte_kind_s8_2s_v()) + /* From gk20a */ + || (k >= gmmu_pte_kind_s8z24_1z_v() && + k <= gmmu_pte_kind_s8z24_ms16_4cszv_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_4cszv_v()) + || (k >= gmmu_pte_kind_z24s8_1z_v() && + k <= gmmu_pte_kind_z24s8_ms16_4cszv_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_4cszv_v()) + || (k >= gmmu_pte_kind_zf32_1z_v() && + k <= gmmu_pte_kind_zf32_ms16_2cz_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1cs_v() && + k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_1cs_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cszv_v()) + || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1cs_v() && + k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_1cs_v()) + || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1zv_v() && + k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cszv_v()) + || (k >= gmmu_pte_kind_zf32_x24s8_1cs_v() && + k <= gmmu_pte_kind_zf32_x24s8_ms16_1cs_v()) + || (k >= gmmu_pte_kind_zf32_x24s8_2cszv_v() && + k <= gmmu_pte_kind_c32_ms2_2cbr_v()) + || (k >= gmmu_pte_kind_c32_ms4_2c_v() && + k <= gmmu_pte_kind_c64_ms2_2cbr_v()) + || (k >= gmmu_pte_kind_c64_ms4_2c_v() && + k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()); } -static bool gv11b_kind_zbc(u8 k) +static noinline_for_stack bool gv11b_kind_zbc(u8 k) { - return (k == gmmu_pte_kind_c32_ms2_4cbra_v() - || k == gmmu_pte_kind_c64_ms2_4cbra_v()); + return /* From gv11b */ + (k == gmmu_pte_kind_c32_ms2_4cbra_v()) + || (k == gmmu_pte_kind_c64_ms2_4cbra_v()) + /* From gp10b */ + || (k >= gmmu_pte_kind_z16_2cz_v() && + k <= gmmu_pte_kind_z16_ms8_2cz_v()) + || (k == gmmu_pte_kind_z16_ms16_2cz_v()) + || (k == gmmu_pte_kind_c32_ms4_4cbra_v()) + || (k == gmmu_pte_kind_c64_ms4_4cbra_v()) + /* From gm20b */ + || (k >= gmmu_pte_kind_s8_v() && + k <= gmmu_pte_kind_s8_2s_v()) + /* From gk20a */ + || (k >= gmmu_pte_kind_z16_2c_v() && + k <= gmmu_pte_kind_z16_ms16_2c_v()) + || (k >= gmmu_pte_kind_s8z24_2cz_v() && + k <= gmmu_pte_kind_s8z24_ms16_4cszv_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2cs_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_2czv_v()) + || (k >= gmmu_pte_kind_v8z24_ms4_vc12_4cszv_v() && + k <= gmmu_pte_kind_v8z24_ms8_vc24_4cszv_v()) + || (k >= gmmu_pte_kind_z24s8_2cs_v() && + k <= gmmu_pte_kind_z24s8_ms16_4cszv_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2cs_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2czv_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_2czv_v()) + || (k >= gmmu_pte_kind_z24v8_ms4_vc12_4cszv_v() && + k <= gmmu_pte_kind_z24v8_ms8_vc24_4cszv_v()) + || (k >= gmmu_pte_kind_zf32_2cs_v() && + k <= gmmu_pte_kind_zf32_ms16_2cz_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1cs_v() && + k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_1cs_v()) + || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1czv_v() && + k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cszv_v()) + || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1cs_v() && + k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_1cs_v()) + || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1czv_v() && + k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cszv_v()) + || (k >= gmmu_pte_kind_zf32_x24s8_1cs_v() && + k <= gmmu_pte_kind_zf32_x24s8_ms16_1cs_v()) + || (k >= gmmu_pte_kind_zf32_x24s8_2cszv_v() && + k <= gmmu_pte_kind_c32_2cra_v()) + || (k >= gmmu_pte_kind_c32_ms2_2c_v() && + k <= gmmu_pte_kind_c32_ms2_2cbr_v()) + || (k >= gmmu_pte_kind_c32_ms4_2c_v() && + k <= gmmu_pte_kind_c32_ms4_2cra_v()) + || (k >= gmmu_pte_kind_c32_ms8_ms16_2c_v() && + k <= gmmu_pte_kind_c64_2cra_v()) + || (k >= gmmu_pte_kind_c64_ms2_2c_v() && + k <= gmmu_pte_kind_c64_ms2_2cbr_v()) + || (k >= gmmu_pte_kind_c64_ms4_2c_v() && + k <= gmmu_pte_kind_c64_ms4_2cra_v()) + || (k >= gmmu_pte_kind_c64_ms8_ms16_2c_v() && + k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()); } static void gv11b_init_kind_attr(void) { u16 k; - for (k = 0; k < 256; k++) { + for (k = 0; k < NV_KIND_ATTR_SIZE; k++) { if (gv11b_kind_supported((u8)k)) gk20a_kind_attr[k] |= GK20A_KIND_ATTR_SUPPORTED; if (gv11b_kind_compressible((u8)k)) gk20a_kind_attr[k] |= GK20A_KIND_ATTR_COMPRESSIBLE; if (gv11b_kind_z((u8)k)) gk20a_kind_attr[k] |= GK20A_KIND_ATTR_Z; + if (gv11b_kind_c((u8)k)) + gk20a_kind_attr[k] |= GK20A_KIND_ATTR_C; if (gv11b_kind_zbc((u8)k)) gk20a_kind_attr[k] |= GK20A_KIND_ATTR_ZBC; } -- cgit v1.2.2