diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | 28 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 2 |
4 files changed, 2 insertions, 35 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index a3bbe034..a817abcd 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1349,9 +1349,9 @@ int gk20a_pm_init(struct device *dev) | |||
1349 | gk20a_dbg_fn(""); | 1349 | gk20a_dbg_fn(""); |
1350 | 1350 | ||
1351 | /* Initialise pm runtime */ | 1351 | /* Initialise pm runtime */ |
1352 | if (platform->clockgate_delay) { | 1352 | if (platform->railgate_delay) { |
1353 | pm_runtime_set_autosuspend_delay(dev, | 1353 | pm_runtime_set_autosuspend_delay(dev, |
1354 | platform->clockgate_delay); | 1354 | platform->railgate_delay); |
1355 | pm_runtime_use_autosuspend(dev); | 1355 | pm_runtime_use_autosuspend(dev); |
1356 | } | 1356 | } |
1357 | 1357 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c index 8eaee190..0c94e246 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | |||
@@ -384,32 +384,6 @@ static ssize_t is_railgated_show(struct device *dev, | |||
384 | } | 384 | } |
385 | static DEVICE_ATTR(is_railgated, S_IRUGO, is_railgated_show, NULL); | 385 | static DEVICE_ATTR(is_railgated, S_IRUGO, is_railgated_show, NULL); |
386 | 386 | ||
387 | static ssize_t clockgate_delay_store(struct device *dev, | ||
388 | struct device_attribute *attr, | ||
389 | const char *buf, size_t count) | ||
390 | { | ||
391 | struct gk20a_platform *platform = dev_get_drvdata(dev); | ||
392 | int clockgate_delay = 0, ret = 0; | ||
393 | |||
394 | ret = sscanf(buf, "%d", &clockgate_delay); | ||
395 | if (ret == 1 && clockgate_delay >= 0) { | ||
396 | platform->clockgate_delay = clockgate_delay; | ||
397 | pm_runtime_set_autosuspend_delay(dev, | ||
398 | platform->clockgate_delay); | ||
399 | } else | ||
400 | dev_err(dev, "Invalid clockgate delay\n"); | ||
401 | |||
402 | return count; | ||
403 | } | ||
404 | static ssize_t clockgate_delay_show(struct device *dev, | ||
405 | struct device_attribute *attr, char *buf) | ||
406 | { | ||
407 | struct gk20a_platform *platform = dev_get_drvdata(dev); | ||
408 | return snprintf(buf, PAGE_SIZE, "%d\n", platform->clockgate_delay); | ||
409 | } | ||
410 | static DEVICE_ATTR(clockgate_delay, ROOTRW, clockgate_delay_show, | ||
411 | clockgate_delay_store); | ||
412 | |||
413 | static ssize_t counters_show(struct device *dev, | 387 | static ssize_t counters_show(struct device *dev, |
414 | struct device_attribute *attr, char *buf) | 388 | struct device_attribute *attr, char *buf) |
415 | { | 389 | { |
@@ -801,7 +775,6 @@ void gk20a_remove_sysfs(struct device *dev) | |||
801 | device_remove_file(dev, &dev_attr_load); | 775 | device_remove_file(dev, &dev_attr_load); |
802 | device_remove_file(dev, &dev_attr_railgate_delay); | 776 | device_remove_file(dev, &dev_attr_railgate_delay); |
803 | device_remove_file(dev, &dev_attr_is_railgated); | 777 | device_remove_file(dev, &dev_attr_is_railgated); |
804 | device_remove_file(dev, &dev_attr_clockgate_delay); | ||
805 | #ifdef CONFIG_PM | 778 | #ifdef CONFIG_PM |
806 | device_remove_file(dev, &dev_attr_force_idle); | 779 | device_remove_file(dev, &dev_attr_force_idle); |
807 | #if defined(CONFIG_PM_GENERIC_DOMAINS) | 780 | #if defined(CONFIG_PM_GENERIC_DOMAINS) |
@@ -843,7 +816,6 @@ void gk20a_create_sysfs(struct device *dev) | |||
843 | error |= device_create_file(dev, &dev_attr_load); | 816 | error |= device_create_file(dev, &dev_attr_load); |
844 | error |= device_create_file(dev, &dev_attr_railgate_delay); | 817 | error |= device_create_file(dev, &dev_attr_railgate_delay); |
845 | error |= device_create_file(dev, &dev_attr_is_railgated); | 818 | error |= device_create_file(dev, &dev_attr_is_railgated); |
846 | error |= device_create_file(dev, &dev_attr_clockgate_delay); | ||
847 | #ifdef CONFIG_PM | 819 | #ifdef CONFIG_PM |
848 | error |= device_create_file(dev, &dev_attr_force_idle); | 820 | error |= device_create_file(dev, &dev_attr_force_idle); |
849 | #if defined(CONFIG_PM_GENERIC_DOMAINS) | 821 | #if defined(CONFIG_PM_GENERIC_DOMAINS) |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 14f90c94..66d97915 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -68,9 +68,6 @@ struct gk20a_platform { | |||
68 | /* Delay before rail gated */ | 68 | /* Delay before rail gated */ |
69 | int railgate_delay; | 69 | int railgate_delay; |
70 | 70 | ||
71 | /* Delay before clock gated */ | ||
72 | int clockgate_delay; | ||
73 | |||
74 | /* Second Level Clock Gating: true = enable false = disable */ | 71 | /* Second Level Clock Gating: true = enable false = disable */ |
75 | bool enable_slcg; | 72 | bool enable_slcg; |
76 | 73 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c index 4d592d28..33937448 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | |||
@@ -861,7 +861,6 @@ struct gk20a_platform gk20a_tegra_platform = { | |||
861 | 861 | ||
862 | /* power management configuration */ | 862 | /* power management configuration */ |
863 | .railgate_delay = 500, | 863 | .railgate_delay = 500, |
864 | .clockgate_delay = 50, | ||
865 | .can_railgate = true, | 864 | .can_railgate = true, |
866 | .can_elpg = true, | 865 | .can_elpg = true, |
867 | .enable_slcg = true, | 866 | .enable_slcg = true, |
@@ -922,7 +921,6 @@ struct gk20a_platform gm20b_tegra_platform = { | |||
922 | 921 | ||
923 | /* power management configuration */ | 922 | /* power management configuration */ |
924 | .railgate_delay = 500, | 923 | .railgate_delay = 500, |
925 | .clockgate_delay = 50, | ||
926 | .can_railgate = true, | 924 | .can_railgate = true, |
927 | .can_elpg = true, | 925 | .can_elpg = true, |
928 | .enable_slcg = true, | 926 | .enable_slcg = true, |