diff options
| author | Alex Deucher | 2016-08-08 20:35:55 +0200 |
|---|---|---|
| committer | Alex Deucher | 2016-08-08 20:35:55 +0200 |
| commit | d06b7e1cf0fa4552fd725111b46df1ed0b649b15 (patch) | |
| tree | 849a4b6c0d9d6f66ef67ba4044503480b8b0bd3d /drivers/gpu | |
| parent | drm/amdgpu: Set ip_blocks according variable amdgpu_virtual_display. (diff) | |
| download | kernel-qcow2-linux-d06b7e1cf0fa4552fd725111b46df1ed0b649b15.tar.gz kernel-qcow2-linux-d06b7e1cf0fa4552fd725111b46df1ed0b649b15.tar.xz kernel-qcow2-linux-d06b7e1cf0fa4552fd725111b46df1ed0b649b15.zip | |
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')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 1 |
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[] = 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 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) { 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 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[] = 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; |