diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2670-drm-amd-display-Use-real-number-of-CRTCs-and-HPDs-in.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2670-drm-amd-display-Use-real-number-of-CRTCs-and-HPDs-in.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2670-drm-amd-display-Use-real-number-of-CRTCs-and-HPDs-in.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2670-drm-amd-display-Use-real-number-of-CRTCs-and-HPDs-in.patch new file mode 100644 index 00000000..f6a6d551 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2670-drm-amd-display-Use-real-number-of-CRTCs-and-HPDs-in.patch @@ -0,0 +1,68 @@ +From 89121ccf8eb9f19c159d432ae802f02da13f7bc0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> +Date: Tue, 24 Oct 2017 11:13:34 +0200 +Subject: [PATCH 2670/4131] drm/amd/display: Use real number of CRTCs and HPDs + in set_irq_funcs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Corresponding to the previous non-DC change. + +Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9 ++++++--- + 2 files changed, 8 insertions(+), 4 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 dd69c02..473e36d 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -1578,7 +1578,6 @@ static int dm_early_init(void *handle) + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + adev->ddev->driver->driver_features |= DRIVER_ATOMIC; +- amdgpu_dm_set_irq_funcs(adev); + + switch (adev->asic_type) { + case CHIP_BONAIRE: +@@ -1652,6 +1651,8 @@ static int dm_early_init(void *handle) + return -EINVAL; + } + ++ amdgpu_dm_set_irq_funcs(adev); ++ + if (adev->mode_info.funcs == NULL) + adev->mode_info.funcs = &dm_display_funcs; + +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 9f3ebbf..b090769 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 +@@ -683,13 +683,16 @@ static const struct amdgpu_irq_src_funcs dm_hpd_irq_funcs = { + + void amdgpu_dm_set_irq_funcs(struct amdgpu_device *adev) + { +- adev->crtc_irq.num_types = AMDGPU_CRTC_IRQ_LAST; ++ if (adev->mode_info.num_crtc > 0) ++ adev->crtc_irq.num_types = AMDGPU_CRTC_IRQ_VLINE1 + adev->mode_info.num_crtc; ++ else ++ adev->crtc_irq.num_types = 0; + adev->crtc_irq.funcs = &dm_crtc_irq_funcs; + +- adev->pageflip_irq.num_types = AMDGPU_PAGEFLIP_IRQ_LAST; ++ adev->pageflip_irq.num_types = adev->mode_info.num_crtc; + adev->pageflip_irq.funcs = &dm_pageflip_irq_funcs; + +- adev->hpd_irq.num_types = AMDGPU_HPD_LAST; ++ adev->hpd_irq.num_types = adev->mode_info.num_hpd; + adev->hpd_irq.funcs = &dm_hpd_irq_funcs; + } + +-- +2.7.4 + |