aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 2e8f469159c5..e69fd332acb5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -95,6 +95,7 @@ extern unsigned amdgpu_pg_mask;
95extern char *amdgpu_disable_cu; 95extern char *amdgpu_disable_cu;
96extern int amdgpu_sclk_deep_sleep_en; 96extern int amdgpu_sclk_deep_sleep_en;
97extern char *amdgpu_virtual_display; 97extern char *amdgpu_virtual_display;
98extern unsigned amdgpu_pp_feature_mask;
98 99
99#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 100#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000
100#define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ 101#define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index ca3d87aac7fb..c96ae105b764 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -95,6 +95,7 @@ unsigned amdgpu_cg_mask = 0xffffffff;
95unsigned amdgpu_pg_mask = 0xffffffff; 95unsigned amdgpu_pg_mask = 0xffffffff;
96char *amdgpu_disable_cu = NULL; 96char *amdgpu_disable_cu = NULL;
97char *amdgpu_virtual_display = NULL; 97char *amdgpu_virtual_display = NULL;
98unsigned amdgpu_pp_feature_mask = 0xffffffff;
98 99
99MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes"); 100MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes");
100module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); 101module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
@@ -177,6 +178,9 @@ module_param_named(powerplay, amdgpu_powerplay, int, 0444);
177 178
178MODULE_PARM_DESC(powercontainment, "Power Containment (1 = enable (default), 0 = disable)"); 179MODULE_PARM_DESC(powercontainment, "Power Containment (1 = enable (default), 0 = disable)");
179module_param_named(powercontainment, amdgpu_powercontainment, int, 0444); 180module_param_named(powercontainment, amdgpu_powercontainment, int, 0444);
181
182MODULE_PARM_DESC(ppfeaturemask, "all power features enabled (default))");
183module_param_named(ppfeaturemask, amdgpu_pp_feature_mask, int, 0444);
180#endif 184#endif
181 185
182MODULE_PARM_DESC(sclkdeepsleep, "SCLK Deep Sleep (1 = enable (default), 0 = disable)"); 186MODULE_PARM_DESC(sclkdeepsleep, "SCLK Deep Sleep (1 = enable (default), 0 = disable)");