diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0164-drm-amd-display-Register-on-VLBLANK-ISR.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/0164-drm-amd-display-Register-on-VLBLANK-ISR.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0164-drm-amd-display-Register-on-VLBLANK-ISR.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0164-drm-amd-display-Register-on-VLBLANK-ISR.patch new file mode 100644 index 00000000..5dc9a828 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0164-drm-amd-display-Register-on-VLBLANK-ISR.patch @@ -0,0 +1,85 @@ +From e41eb0abfc8eace8edac18f910f1ebbdd225e3cf Mon Sep 17 00:00:00 2001 +From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> +Date: Wed, 19 Apr 2017 13:29:11 -0400 +Subject: [PATCH 0164/4131] drm/amd/display: Register on VLBLANK ISR. + +Switch from VUPDATE to VBLANK. + +Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +++++++------ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- + 3 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 48371d3..7bf48c2 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -201,7 +201,7 @@ static void dm_crtc_high_irq(void *interrupt_params) + uint8_t crtc_index = 0; + struct amdgpu_crtc *acrtc; + +- acrtc = get_crtc_by_otg_inst(adev, irq_params->irq_src - IRQ_TYPE_VUPDATE); ++ acrtc = get_crtc_by_otg_inst(adev, irq_params->irq_src - IRQ_TYPE_VBLANK); + + if (acrtc) + crtc_index = acrtc->crtc_id; +@@ -1026,9 +1026,10 @@ static int dce110_register_irq_handlers(struct amdgpu_device *adev) + * amdgpu_dm_irq_handler() will re-direct the interrupt to DC + * for acknowledging and handling. */ + +- for (i = VISLANDS30_IV_SRCID_D1_V_UPDATE_INT; +- i <= VISLANDS30_IV_SRCID_D6_V_UPDATE_INT; i += 2) { +- r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, i, &adev->crtc_irq); ++ /* Use VBLANK interrupt */ ++ for (i = 0; i < adev->mode_info.num_crtc; i++) { ++ r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, i+1, &adev->crtc_irq); ++ + if (r) { + DRM_ERROR("Failed to add crtc irq id!\n"); + return r; +@@ -1036,9 +1037,9 @@ static int dce110_register_irq_handlers(struct amdgpu_device *adev) + + int_params.int_context = INTERRUPT_HIGH_IRQ_CONTEXT; + int_params.irq_source = +- dc_interrupt_to_irq_source(dc, i, 0); ++ dc_interrupt_to_irq_source(dc, i+1, 0); + +- c_irq_params = &adev->dm.vupdate_params[int_params.irq_source - DC_IRQ_SOURCE_VUPDATE1]; ++ c_irq_params = &adev->dm.vblank_params[int_params.irq_source - DC_IRQ_SOURCE_VBLANK1]; + + c_irq_params->adev = adev; + c_irq_params->irq_src = int_params.irq_source; +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +index 1b54566..d6ebba0 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +@@ -105,7 +105,7 @@ struct amdgpu_display_manager { + pflip_params[DC_IRQ_SOURCE_PFLIP_LAST - DC_IRQ_SOURCE_PFLIP_FIRST + 1]; + + struct common_irq_params +- vupdate_params[DC_IRQ_SOURCE_VUPDATE6 - DC_IRQ_SOURCE_VUPDATE1 + 1]; ++ vblank_params[DC_IRQ_SOURCE_VBLANK6 - DC_IRQ_SOURCE_VBLANK1 + 1]; + + /* this spin lock synchronizes access to 'irq_handler_list_table' */ + spinlock_t irq_handler_list_table_lock; +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +index 20e0749..682e9c3 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +@@ -736,7 +736,7 @@ static int amdgpu_dm_set_crtc_irq_state(struct amdgpu_device *adev, + source, + crtc_id, + state, +- IRQ_TYPE_VUPDATE, ++ IRQ_TYPE_VBLANK, + __func__); + } + +-- +2.7.4 + |