From 364156cdcd706510bc37b93a3c7109b45b02d318 Mon Sep 17 00:00:00 2001 From: sujeet baranwal Date: Mon, 22 Dec 2014 12:35:15 -0800 Subject: gpu: nvgpu: Pre-Population of zbc entries The default zbc entries were never populated in zbc HW table because the conditional flag "gr->sw_ready" was always set thus avoided the zbc default loading function call. Now zbc default loading would happen only during boot time in sw structure.Hw zbc regs would be loaded from that structure every time a railgate exit happens. Bug 1580210 Change-Id: Ie3e40738cbc84cf724c3f3871f15b17a5c84025a Signed-off-by: Sujeet Baranwal Reviewed-on: http://git-master/r/662306 Reviewed-by: Sami Kiminki Tested-by: Lauri Peltonen Reviewed-by: Arto Merilainen GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h | 12 ++++++++++++ drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h | 4 ++++ 2 files changed, 16 insertions(+) (limited to 'drivers/gpu/nvgpu/gm20b') diff --git a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h index 8783a0bc..e8675bea 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h @@ -238,4 +238,16 @@ static inline u32 ctxsw_prog_main_image_misc_options_verif_features_disabled_f(v { return 0x0; } +static inline u32 ctxsw_prog_main_image_preemption_options_o(void) +{ + return 0x00000060; +} +static inline u32 ctxsw_prog_main_image_preemption_options_control_f(u32 v) +{ + return (v & 0x3) << 0; +} +static inline u32 ctxsw_prog_main_image_preemption_options_control_cta_enabled_f(void) +{ + return 0x1; +} #endif diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h index 8e4308a3..34cf20de 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h @@ -1302,6 +1302,10 @@ static inline u32 gr_ds_zbc_color_fmt_val_rf32_gf32_bf32_af32_v(void) { return 0x00000004; } +static inline u32 gr_ds_zbc_color_fmt_val_a8_b8_g8_r8_v(void) +{ + return 0x00000028; +} static inline u32 gr_ds_zbc_z_r(void) { return 0x00405818; -- cgit v1.2.2