diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0795-drm-amd-dal-fix-flip-clean-up-state.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0795-drm-amd-dal-fix-flip-clean-up-state.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/common/recipes-kernel/linux/files/0795-drm-amd-dal-fix-flip-clean-up-state.patch b/common/recipes-kernel/linux/files/0795-drm-amd-dal-fix-flip-clean-up-state.patch deleted file mode 100644 index 73a072cf..00000000 --- a/common/recipes-kernel/linux/files/0795-drm-amd-dal-fix-flip-clean-up-state.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 36331681b029511df4aab4f24bed95fe12087a7b Mon Sep 17 00:00:00 2001 -From: Mykola Lysenko <Mykola.Lysenko@amd.com> -Date: Wed, 6 Jan 2016 18:24:48 +0800 -Subject: [PATCH 0795/1110] drm/amd/dal: fix flip clean-up state - -Get on par with buffer management changes made in base driver -(see fba4c336 base driver commit for reference). - -Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com> -Acked-by: Harry Wentland <harry.wentland@amd.com> ---- - drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 10 ++++------ - drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c | 17 +++++++++++------ - 2 files changed, 15 insertions(+), 12 deletions(-) - -diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c -index 6329658..0061b8c 100644 ---- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c -@@ -1330,7 +1330,7 @@ void amdgpu_dm_flip_cleanup( - } else - DRM_ERROR("failed to reserve buffer after flip\n"); - -- drm_gem_object_unreference_unlocked(&works->old_rbo->gem_base); -+ amdgpu_bo_unref(&works->old_rbo); - kfree(works->shared); - kfree(works); - } -@@ -1380,13 +1380,11 @@ static void dm_page_flip(struct amdgpu_device *adev, - target = acrtc->target; - - /* -- * Received a page flip call after the display has been reset. Make sure -- * we return the buffers. -+ * Received a page flip call after the display has been reset. -+ * Just return in this case. Everything should be clean-up on reset. - */ -- if (!target) { -- amdgpu_dm_flip_cleanup(adev, acrtc); -+ if (!target) - return; -- } - - addr.address.grph.addr.low_part = lower_32_bits(crtc_base); - addr.address.grph.addr.high_part = upper_32_bits(crtc_base); -diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index 7468990..df7afc9 100644 ---- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -1970,22 +1970,27 @@ static void manage_dm_interrupts( - struct amdgpu_crtc *acrtc, - bool enable) - { -+ /* -+ * this is not correct translation but will work as soon as VBLANK -+ * constant is the same as PFLIP -+ */ -+ int irq_type = -+ amdgpu_crtc_idx_to_irq_type( -+ adev, -+ acrtc->crtc_id); -+ - if (enable) { - drm_crtc_vblank_on(&acrtc->base); - amdgpu_irq_get( - adev, - &adev->pageflip_irq, -- amdgpu_crtc_idx_to_irq_type( -- adev, -- acrtc->crtc_id)); -+ irq_type); - } else { - unsigned long flags; - amdgpu_irq_put( - adev, - &adev->pageflip_irq, -- amdgpu_crtc_idx_to_irq_type( -- adev, -- acrtc->crtc_id)); -+ irq_type); - drm_crtc_vblank_off(&acrtc->base); - - /* --- -2.7.4 - |