From 3bd9d5764c9ab622302be912f549c7a0a7fcf643 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 14 Apr 2017 13:21:25 -0700 Subject: gpu: nvgpu: Move default_pri_timeout to gk20a Copy default_pri_timeout to struct gk20a at probe time, and access it from gk20a instead of platform_gk20a. JIRA NVGPU-16 Change-Id: Ic361e6be59df73d9b627c97fdcff190b00dfe179 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1463541 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/bus_gk20a.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/bus_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c index e81a5b2a..5f25271f 100644 --- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c @@ -27,16 +27,13 @@ void gk20a_bus_init_hw(struct gk20a *g) { - struct gk20a_platform *platform = gk20a_get_platform(g->dev); - /* enable pri timeout only on silicon */ if (nvgpu_platform_is_silicon(g)) { gk20a_writel(g, timer_pri_timeout_r(), timer_pri_timeout_period_f( - platform->default_pri_timeout ? - platform->default_pri_timeout : - 0x186A0) | + g->default_pri_timeout ? + g->default_pri_timeout : 0x186A0) | timer_pri_timeout_en_en_enabled_f()); } else { gk20a_writel(g, -- cgit v1.2.2