From 2001b8ec9760a7113293b2179eec7a31d28e71f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20H=C3=B6ltt=C3=A4?= Date: Mon, 20 Apr 2020 12:34:19 +0300 Subject: [PATCH] gpu: nvgpu: remove aggressive sync init from platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the boolean aggressive_sync_destroy flag from struct gk20a_platform; only the threshold to set the channel limit is useful in the platform data. The boolean flag is a runtime condition and it always starts as false. Jira NVGPU-4548 Change-Id: I1a4b9903978ab239581857ff791a7983f59fdc13 Signed-off-by: Konsta Hölttä Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2331357 Reviewed-by: automaticguardword Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/driver_common.c | 1 - drivers/gpu/nvgpu/os/linux/platform_gk20a.h | 3 --- drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 1 - 3 files changed, 5 deletions(-) diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index a1bba9cba..e377b6f26 100644 --- a/drivers/gpu/nvgpu/os/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c @@ -177,7 +177,6 @@ static void nvgpu_init_pm_vars(struct gk20a *g) nvgpu_set_enabled(g, NVGPU_GPU_CAN_BLCG, nvgpu_platform_is_silicon(g) ? platform->can_blcg : false); - g->aggressive_sync_destroy = platform->aggressive_sync_destroy; g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; #ifdef CONFIG_NVGPU_SUPPORT_CDE g->has_cde = platform->has_cde; diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h index d7a4458db..62d61e784 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h @@ -87,9 +87,6 @@ struct gk20a_platform { /* channel limit after which to start aggressive sync destroy */ unsigned int aggressive_sync_destroy_thresh; - /* flag to set sync destroy aggressiveness */ - bool aggressive_sync_destroy; - /* set if ASPM should be disabled on boot; only makes sense for PCI */ bool disable_aspm; diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index f82c0a1c2..298c7e34d 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -98,7 +98,6 @@ static void vgpu_init_vars(struct gk20a *g, struct gk20a_platform *platform) nvgpu_atomic_set(&g->clk_arb_global_nr, 0); - g->aggressive_sync_destroy = platform->aggressive_sync_destroy; g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, platform->has_syncpoints); g->ptimer_src_freq = platform->ptimer_src_freq;