From aad14b2ed0cb158bbadf5cdd916c039de4e78f0c Mon Sep 17 00:00:00 2001 From: Mykola Lysenko Date: Thu, 31 Mar 2016 18:06:19 -0400 Subject: [PATCH 0735/1110] drm/amdgpu: remove double drm_vblank_init call When DAL enabled, drm_vblank_init will be called from inside DM code, so guarding this one for the case when DAL is not enabled Signed-off-by: Mykola Lysenko Reviewed-by: Harry Wentland Reviewed-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 4fe38d7..7ad2aed 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -219,11 +219,6 @@ int amdgpu_irq_init(struct amdgpu_device *adev) int r = 0; spin_lock_init(&adev->irq.lock); - r = drm_vblank_init(adev->ddev, adev->mode_info.num_crtc); - if (r) { - return r; - } - adev->ddev->vblank_disable_allowed = true; /* enable msi */ adev->irq.msi_enabled = false; @@ -237,10 +232,15 @@ int amdgpu_irq_init(struct amdgpu_device *adev) } if (!amdgpu_has_dal_support(adev)) { + r = drm_vblank_init(adev->ddev, adev->mode_info.num_crtc); + if (r) + return r; + /* pre DCE11 */ INIT_WORK(&adev->hotplug_work, amdgpu_hotplug_work_func); } + adev->ddev->vblank_disable_allowed = true; INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); -- 2.7.4