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>

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 15200b1..e539b28 100644 (file)
--- 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[] =
 int cik_set_ip_blocks(struct amdgpu_device *adev)
 {
        if (amdgpu_virtual_display) {
-               adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
                switch (adev->asic_type) {
                case CHIP_BONAIRE:
                        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 1c16983..4c8ca58 100644 (file)
--- 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)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
        dce_virtual_set_display_funcs(adev);
        dce_virtual_set_irq_funcs(adev);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 0642917..2d3e3ed 100644 (file)
--- 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[] =
 int vi_set_ip_blocks(struct amdgpu_device *adev)
 {
        if (amdgpu_virtual_display) {
-               adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
                switch (adev->asic_type) {
                case CHIP_TOPAZ:
                        adev->ip_blocks = topaz_ip_blocks;