aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-08-08 14:35:55 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-08-08 14:35:55 -0400
commitd06b7e1cf0fa4552fd725111b46df1ed0b649b15 (patch)
tree849a4b6c0d9d6f66ef67ba4044503480b8b0bd3d /drivers/gpu/drm/amd/amdgpu
parenta6be7570518f85ce94ca9d6540543e00725828d3 (diff)
drm/amdgpu: move vsync_timer_enabled setup to dce virtual early_init
Put it in one place. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_virtual.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vi.c1
3 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 15200b1b77d6..e539b28dbef7 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -2324,7 +2324,6 @@ static const struct amdgpu_ip_block_version kaveri_ip_blocks_vd[] =
2324int cik_set_ip_blocks(struct amdgpu_device *adev) 2324int cik_set_ip_blocks(struct amdgpu_device *adev)
2325{ 2325{
2326 if (amdgpu_virtual_display) { 2326 if (amdgpu_virtual_display) {
2327 adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
2328 switch (adev->asic_type) { 2327 switch (adev->asic_type) {
2329 case CHIP_BONAIRE: 2328 case CHIP_BONAIRE:
2330 adev->ip_blocks = bonaire_ip_blocks_vd; 2329 adev->ip_blocks = bonaire_ip_blocks_vd;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 1c16983ec8b6..4c8ca58a3f94 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -353,6 +353,7 @@ static int dce_virtual_early_init(void *handle)
353{ 353{
354 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 354 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
355 355
356 adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
356 dce_virtual_set_display_funcs(adev); 357 dce_virtual_set_display_funcs(adev);
357 dce_virtual_set_irq_funcs(adev); 358 dce_virtual_set_irq_funcs(adev);
358 359
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 064291771d79..2d3e3ed84dcb 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1388,7 +1388,6 @@ static const struct amdgpu_ip_block_version cz_ip_blocks_vd[] =
1388int vi_set_ip_blocks(struct amdgpu_device *adev) 1388int vi_set_ip_blocks(struct amdgpu_device *adev)
1389{ 1389{
1390 if (amdgpu_virtual_display) { 1390 if (amdgpu_virtual_display) {
1391 adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
1392 switch (adev->asic_type) { 1391 switch (adev->asic_type) {
1393 case CHIP_TOPAZ: 1392 case CHIP_TOPAZ:
1394 adev->ip_blocks = topaz_ip_blocks; 1393 adev->ip_blocks = topaz_ip_blocks;