From 2c822a63885ec79ac2d860e13438c6154e23e5d0 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 12 May 2017 10:32:11 -0700 Subject: gpu: nvgpu: Remove uses of platform->can_elpg Remove newly introduced uses of gk20a_platform->can_elpg. Rename the field to can_elpg_init and replace all uses with gk20a->can_elpg. Change-Id: Id6e84d4c16159b5da80c583a8a94a9c5cc2423ec Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1480955 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/driver_common.c | 2 +- drivers/gpu/nvgpu/common/linux/pci.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index c2f31afc..8855ce1f 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c @@ -106,7 +106,7 @@ static void nvgpu_init_pm_vars(struct gk20a *g) g->mscg_enabled = nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false; g->can_elpg = - nvgpu_platform_is_silicon(g) ? platform->can_elpg : false; + nvgpu_platform_is_silicon(g) ? platform->can_elpg_init : false; g->default_pri_timeout = platform->default_pri_timeout; g->aggressive_sync_destroy = platform->aggressive_sync_destroy; g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index a603135f..37673f5e 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c @@ -66,7 +66,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { /* power management configuration */ .railgate_delay_init = 500, .can_railgate_init = false, - .can_elpg = true, + .can_elpg_init = true, .enable_elpg = true, .enable_elcg = false, .enable_slcg = true, @@ -100,7 +100,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { /* power management configuration */ .railgate_delay_init = 500, .can_railgate_init = false, - .can_elpg = true, + .can_elpg_init = true, .enable_elpg = true, .enable_elcg = false, .enable_slcg = true, @@ -134,7 +134,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { /* power management configuration */ .railgate_delay_init = 500, .can_railgate_init = false, - .can_elpg = true, + .can_elpg_init = true, .enable_elpg = true, .enable_elcg = false, .enable_slcg = true, @@ -168,7 +168,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { /* power management configuration */ .railgate_delay_init = 500, .can_railgate_init = false, - .can_elpg = true, + .can_elpg_init = true, .enable_elpg = true, .enable_elcg = false, .enable_slcg = true, -- cgit v1.2.2