diff options
author | Emily Deng <Emily.Deng@amd.com> | 2016-08-10 04:01:25 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-10 14:04:17 -0400 |
commit | 9accf2fd33e969862c55be0c20dbfb9b0890bbb8 (patch) | |
tree | e5af1b2ffec41f0a439ba3b4a49210dee0cdb2b6 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 4f4b78341b658cfa0ca7b1587f5540c21f9db997 (diff) |
drm/amdgpu: Change the virtual_display type from int to char*.
For virtual display feature, as there may be multiple GPUs,
for user could choose whiche GPU need to enable this feature, change
the type of virtual_display from int to char*. The variable will be set
like this virtual_display="xxxx:xx:xx.x;xxxx:xx:xx.x;".
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 54f71565e6cc..46f250c80a31 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -92,7 +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 | extern char *amdgpu_virtual_display; |
96 | 96 | ||
97 | #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 | 97 | #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 |
98 | #define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ | 98 | #define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ |
@@ -2072,6 +2072,7 @@ struct amdgpu_device { | |||
2072 | atomic_t gpu_reset_counter; | 2072 | atomic_t gpu_reset_counter; |
2073 | 2073 | ||
2074 | /* display */ | 2074 | /* display */ |
2075 | bool enable_virtual_display; | ||
2075 | struct amdgpu_mode_info mode_info; | 2076 | struct amdgpu_mode_info mode_info; |
2076 | struct work_struct hotplug_work; | 2077 | struct work_struct hotplug_work; |
2077 | struct amdgpu_irq_src crtc_irq; | 2078 | struct amdgpu_irq_src crtc_irq; |