diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/1301-drm-amdgpu-remove-double-drm_vblank_init-call.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/1301-drm-amdgpu-remove-double-drm_vblank_init-call.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/common/recipes-kernel/linux/files/1301-drm-amdgpu-remove-double-drm_vblank_init-call.patch b/common/recipes-kernel/linux/files/1301-drm-amdgpu-remove-double-drm_vblank_init-call.patch deleted file mode 100644 index 84177774..00000000 --- a/common/recipes-kernel/linux/files/1301-drm-amdgpu-remove-double-drm_vblank_init-call.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1635924337e5866c72f5f6f992c1456d7dc5f232 Mon Sep 17 00:00:00 2001 -From: Mykola Lysenko <Mykola.Lysenko@amd.com> -Date: Thu, 28 Jan 2016 18:27:15 +0800 -Subject: [PATCH 1301/1565] 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 <Mykola.Lysenko@amd.com> -Reviewed-by: Harry Wentland <harry.wentland@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c -index 45ff524..8ee32ec 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c -@@ -218,10 +218,7 @@ 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; -- } -+ - /* enable msi */ - adev->irq.msi_enabled = false; - -@@ -234,6 +231,10 @@ 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); --- -1.9.1 - |