From b82c86a8650aa11cd730c5b8a62315d63ce62ad4 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 11 Feb 2015 13:10:25 -0800 Subject: gpu: nvgpu: Ensure memory subsystem is enabled Ensure that memory subsystem is enabled at init. Bug 1603128 Change-Id: Ie3fcd4d9df4dbd480e44fa8919fc311e61b627ca Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/707027 Reviewed-by: Seshendra Gadagottu --- drivers/gpu/nvgpu/gk20a/fb_gk20a.c | 8 ++++++++ drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c index 568aed7a..b73be02a 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c @@ -22,12 +22,20 @@ static void fb_gk20a_reset(struct gk20a *g) { + u32 val; + gk20a_dbg_info("reset gk20a fb"); gk20a_reset(g, mc_enable_pfb_enabled_f() | mc_enable_l2_enabled_f() | mc_enable_xbar_enabled_f() | mc_enable_hub_enabled_f()); + + val = gk20a_readl(g, mc_elpg_enable_r()); + val |= mc_elpg_enable_xbar_enabled_f() + | mc_elpg_enable_pfb_enabled_f() + | mc_elpg_enable_hub_enabled_f(); + gk20a_writel(g, mc_elpg_enable_r(), val); } static void gk20a_fb_set_mmu_page_size(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h index 97517a77..ea3c2528 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h @@ -266,4 +266,20 @@ static inline u32 mc_enable_pb_sel_f(u32 v, u32 i) { return (v & 0x1) << (0 + i*1); } +static inline u32 mc_elpg_enable_r(void) +{ + return 0x0000020c; +} +static inline u32 mc_elpg_enable_xbar_enabled_f(void) +{ + return 0x4; +} +static inline u32 mc_elpg_enable_pfb_enabled_f(void) +{ + return 0x100000; +} +static inline u32 mc_elpg_enable_hub_enabled_f(void) +{ + return 0x20000000; +} #endif -- cgit v1.2.2