Attachment 137327 Details for Bug 105018 – Patch 2 Return success when enabling interrupt

[patch] Patch 2 Return success when enabling interrupt

0002-drm-amd-display-Return-success-when-enabling-interru.patch (text/plain), 2.54 KB, created by Harry Wentland on 2018-02-13 18:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harry Wentland

Created: 2018-02-13 18:40:03 UTC

Size: 2.54 KB

patch

obsolete

>From 8e705b8d1b4b32c1d5a2c6ecefc08476854eab69 Mon Sep 17 00:00:00 2001
>From: Harry Wentland <harry.wentland@amd.com>
>Date: Tue, 13 Feb 2018 11:03:01 -0500
>Subject: [PATCH] drm/amd/display: Return success when enabling interrupt
>
>Signed-off-by: Harry Wentland <harry.wentland@amd.com>
>---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
> drivers/gpu/drm/amd/display/dc/core/dc.c          | 6 +++---
> drivers/gpu/drm/amd/display/dc/dc.h               | 2 +-
> 3 files changed, 5 insertions(+), 6 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 1244511a0770..1c2a0e1e60f3 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -2499,8 +2499,7 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
> 	struct amdgpu_device *adev = crtc->dev->dev_private;
> 
> 	irq_source = IRQ_TYPE_VBLANK + acrtc->otg_inst;
>-	dc_interrupt_set(adev->dm.dc, irq_source, enable);
>-	return 0;
>+	return dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
> }
> 
> static int dm_enable_vblank(struct drm_crtc *crtc)
>diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
>index 77a1bf233c3c..9ea28de6af96 100644
>--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
>+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
>@@ -1515,13 +1515,13 @@ enum dc_irq_source dc_interrupt_to_irq_source(
> 	return dal_irq_service_to_irq_source(dc->res_pool->irqs, src_id, ext_id);
> }
> 
>-void dc_interrupt_set(struct dc *dc, enum dc_irq_source src, bool enable)
>+bool dc_interrupt_set(struct dc *dc, enum dc_irq_source src, bool enable)
> {
> 
> 	if (dc == NULL)
>-		return;
>+		return false;
> 
>-	dal_irq_service_set(dc->res_pool->irqs, src, enable);
>+	return dal_irq_service_set(dc->res_pool->irqs, src, enable);
> }
> 
> void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src)
>diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
>index 5bb0e5defaf4..8c7e588b7afc 100644
>--- a/drivers/gpu/drm/amd/display/dc/dc.h
>+++ b/drivers/gpu/drm/amd/display/dc/dc.h
>@@ -694,7 +694,7 @@ enum dc_irq_source dc_interrupt_to_irq_source(
> 		struct dc *dc,
> 		uint32_t src_id,
> 		uint32_t ext_id);
>-void dc_interrupt_set(struct dc *dc, enum dc_irq_source src, bool enable);
>+bool dc_interrupt_set(struct dc *dc, enum dc_irq_source src, bool enable);
> void dc_interrupt_ack(struct dc *dc, enum dc_irq_source src);
> enum dc_irq_source dc_get_hpd_irq_source_at_index(
> 		struct dc *dc, uint32_t link_index);
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 105018: 137308 | 137322 | 137323 | 137324 | 137325 | 137327 | 137383

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.