diff options
author | Emily Deng <Emily.Deng@amd.com> | 2016-08-07 23:37:29 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-08 14:33:28 -0400 |
commit | e443059d0f41fcc07f0fb6b3b8ae96dc3d2364c7 (patch) | |
tree | 9067e2457d87310225091a2db3536b126c60a902 | |
parent | e9ed3a67cd1bfd8d0d0dc4968a36f6ea4db2d45a (diff) |
drm/amdgpu: Define one variable for virtual display.
For virtual display feature, define on variable in amdgpu.ko. When want to
enable virtual display feature, need set the option "amdgpu.virtual_display=1".
And then disable vga render and crtc if have DCE engine.
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 |
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 12112cc65dae..54f71565e6cc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -92,6 +92,7 @@ extern unsigned amdgpu_cg_mask; | |||
92 | extern unsigned amdgpu_pg_mask; | 92 | extern unsigned amdgpu_pg_mask; |
93 | extern char *amdgpu_disable_cu; | 93 | extern char *amdgpu_disable_cu; |
94 | extern int amdgpu_sclk_deep_sleep_en; | 94 | extern int amdgpu_sclk_deep_sleep_en; |
95 | extern int amdgpu_virtual_display; | ||
95 | 96 | ||
96 | #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 | 97 | #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 |
97 | #define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ | 98 | #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 44fda31c75d2..421dbbfd5e1b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
@@ -90,6 +90,7 @@ unsigned amdgpu_pcie_lane_cap = 0; | |||
90 | unsigned amdgpu_cg_mask = 0xffffffff; | 90 | unsigned amdgpu_cg_mask = 0xffffffff; |
91 | unsigned amdgpu_pg_mask = 0xffffffff; | 91 | unsigned amdgpu_pg_mask = 0xffffffff; |
92 | char *amdgpu_disable_cu = NULL; | 92 | char *amdgpu_disable_cu = NULL; |
93 | int amdgpu_virtual_display = 0; | ||
93 | 94 | ||
94 | MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes"); | 95 | MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes"); |
95 | module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); | 96 | module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); |
@@ -189,6 +190,9 @@ module_param_named(pg_mask, amdgpu_pg_mask, uint, 0444); | |||
189 | MODULE_PARM_DESC(disable_cu, "Disable CUs (se.sh.cu,...)"); | 190 | MODULE_PARM_DESC(disable_cu, "Disable CUs (se.sh.cu,...)"); |
190 | module_param_named(disable_cu, amdgpu_disable_cu, charp, 0444); | 191 | module_param_named(disable_cu, amdgpu_disable_cu, charp, 0444); |
191 | 192 | ||
193 | MODULE_PARM_DESC(virtual_display, "enable virtual display (0 = disable virtual display)"); | ||
194 | module_param_named(virtual_display, amdgpu_virtual_display, int, 0444); | ||
195 | |||
192 | static const struct pci_device_id pciidlist[] = { | 196 | static const struct pci_device_id pciidlist[] = { |
193 | #ifdef CONFIG_DRM_AMDGPU_CIK | 197 | #ifdef CONFIG_DRM_AMDGPU_CIK |
194 | /* Kaveri */ | 198 | /* Kaveri */ |