* [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard
@ 2021-05-07 20:36 Alex Deucher
2021-05-07 20:36 ` [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined Alex Deucher
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alex Deucher @ 2021-05-07 20:36 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
The DCN3 guards were dropped a while ago, this one must have
snuck in in a merge or something.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
1 file changed, 2 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 bdbc577be65c..73d41cdd98ba 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3720,10 +3720,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
/* Use Outbox interrupt */
switch (adev->asic_type) {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
-#endif
case CHIP_RENOIR:
if (register_outbox_irq_handlers(dm->adev)) {
DRM_ERROR("DM: Failed to initialize IRQ\n");
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined
2021-05-07 20:36 [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Alex Deucher
@ 2021-05-07 20:36 ` Alex Deucher
2021-05-10 12:43 ` Shih, Jude
2021-05-07 20:36 ` [PATCH 3/3] drm/amdgpu/display: fix build " Alex Deucher
2021-05-10 21:42 ` [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Rodrigo Siqueira
2 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2021-05-07 20:36 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Jude Shih
Fixes:
At top level:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:633:13: warning: ‘dm_dmub_outbox1_low_irq’ defined but not used [-Wunused-function]
633 | static void dm_dmub_outbox1_low_irq(void *interrupt_params)
| ^~~~~~~~~~~~~~~~~~~~~~~
Fixes: 77a49c458931 ("drm/amd/display: Support for DMUB AUX")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Jude Shih <Jude.Shih@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 73d41cdd98ba..77bde54c9515 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -620,7 +620,6 @@ static void dm_dcn_vertical_interrupt0_high_irq(void *interrupt_params)
amdgpu_dm_crtc_handle_crc_window_irq(&acrtc->base);
}
#endif
-#endif
/**
* dm_dmub_outbox1_low_irq() - Handles Outbox interrupt
@@ -673,6 +672,7 @@ static void dm_dmub_outbox1_low_irq(void *interrupt_params)
ASSERT(count <= DMUB_TRACE_MAX_READ);
}
+#endif
static int dm_set_clockgating_state(void *handle,
enum amd_clockgating_state state)
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not defined
2021-05-07 20:36 [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Alex Deucher
2021-05-07 20:36 ` [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined Alex Deucher
@ 2021-05-07 20:36 ` Alex Deucher
2021-05-10 12:43 ` Shih, Jude
2021-05-10 21:42 ` [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Rodrigo Siqueira
2 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2021-05-07 20:36 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Jude Shish
Fixes:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_initialize_drm_device’:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:3726:7: error: implicit declaration of function ‘register_outbox_irq_handlers’; did you mean ‘register_hpd_handlers’? [-Werror=implicit-function-declaration]
3726 | if (register_outbox_irq_handlers(dm->adev)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| register_hpd_handlers
Fixes: 77a49c458931 ("drm/amd/display: Support for DMUB AUX")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Jude Shish <Jude.Shih@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++
1 file changed, 2 insertions(+)
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 77bde54c9515..8ee9c03bf26c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3718,6 +3718,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
goto fail;
}
+#if defined(CONFIG_DRM_AMD_DC_DCN)
/* Use Outbox interrupt */
switch (adev->asic_type) {
case CHIP_SIENNA_CICHLID:
@@ -3731,6 +3732,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
default:
DRM_DEBUG_KMS("Unsupported ASIC type for outbox: 0x%X\n", adev->asic_type);
}
+#endif
/* loops over all connectors on the board */
for (i = 0; i < link_cnt; i++) {
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 3/3] drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not defined
2021-05-07 20:36 ` [PATCH 3/3] drm/amdgpu/display: fix build " Alex Deucher
@ 2021-05-10 12:43 ` Shih, Jude
0 siblings, 0 replies; 6+ messages in thread
From: Shih, Jude @ 2021-05-10 12:43 UTC (permalink / raw)
To: Deucher, Alexander, amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Reviewed-by: Jude Shih <shenshih@amd.com>
-----Original Message-----
From: Deucher, Alexander <Alexander.Deucher@amd.com>
Sent: Saturday, May 8, 2021 4:37 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Shih, Jude <Jude.Shih@amd.com>
Subject: [PATCH 3/3] drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not defined
Fixes:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_initialize_drm_device’:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:3726:7: error: implicit declaration of function ‘register_outbox_irq_handlers’; did you mean ‘register_hpd_handlers’? [-Werror=implicit-function-declaration]
3726 | if (register_outbox_irq_handlers(dm->adev)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| register_hpd_handlers
Fixes: 77a49c458931 ("drm/amd/display: Support for DMUB AUX")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Jude Shish <Jude.Shih@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++
1 file changed, 2 insertions(+)
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 77bde54c9515..8ee9c03bf26c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3718,6 +3718,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
goto fail;
}
+#if defined(CONFIG_DRM_AMD_DC_DCN)
/* Use Outbox interrupt */
switch (adev->asic_type) {
case CHIP_SIENNA_CICHLID:
@@ -3731,6 +3732,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
default:
DRM_DEBUG_KMS("Unsupported ASIC type for outbox: 0x%X\n", adev->asic_type);
}
+#endif
/* loops over all connectors on the board */
for (i = 0; i < link_cnt; i++) {
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined
2021-05-07 20:36 ` [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined Alex Deucher
@ 2021-05-10 12:43 ` Shih, Jude
0 siblings, 0 replies; 6+ messages in thread
From: Shih, Jude @ 2021-05-10 12:43 UTC (permalink / raw)
To: Deucher, Alexander, amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Reviewed-by: Jude Shih <shenshih@amd.com>
-----Original Message-----
From: Deucher, Alexander <Alexander.Deucher@amd.com>
Sent: Saturday, May 8, 2021 4:37 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Shih, Jude <Jude.Shih@amd.com>
Subject: [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined
Fixes:
At top level:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:633:13: warning: ‘dm_dmub_outbox1_low_irq’ defined but not used [-Wunused-function]
633 | static void dm_dmub_outbox1_low_irq(void *interrupt_params)
| ^~~~~~~~~~~~~~~~~~~~~~~
Fixes: 77a49c458931 ("drm/amd/display: Support for DMUB AUX")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Jude Shih <Jude.Shih@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 73d41cdd98ba..77bde54c9515 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -620,7 +620,6 @@ static void dm_dcn_vertical_interrupt0_high_irq(void *interrupt_params)
amdgpu_dm_crtc_handle_crc_window_irq(&acrtc->base);
}
#endif
-#endif
/**
* dm_dmub_outbox1_low_irq() - Handles Outbox interrupt @@ -673,6 +672,7 @@ static void dm_dmub_outbox1_low_irq(void *interrupt_params)
ASSERT(count <= DMUB_TRACE_MAX_READ);
}
+#endif
static int dm_set_clockgating_state(void *handle,
enum amd_clockgating_state state)
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard
2021-05-07 20:36 [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Alex Deucher
2021-05-07 20:36 ` [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined Alex Deucher
2021-05-07 20:36 ` [PATCH 3/3] drm/amdgpu/display: fix build " Alex Deucher
@ 2021-05-10 21:42 ` Rodrigo Siqueira
2 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Siqueira @ 2021-05-10 21:42 UTC (permalink / raw)
To: Alex Deucher; +Cc: amd-gfx
[-- Attachment #1.1: Type: text/plain, Size: 1677 bytes --]
Thanks,
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
On 05/07, Alex Deucher wrote:
> The DCN3 guards were dropped a while ago, this one must have
> snuck in in a merge or something.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
> 1 file changed, 2 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 bdbc577be65c..73d41cdd98ba 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3720,10 +3720,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
>
> /* Use Outbox interrupt */
> switch (adev->asic_type) {
> -#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
> case CHIP_SIENNA_CICHLID:
> case CHIP_NAVY_FLOUNDER:
> -#endif
> case CHIP_RENOIR:
> if (register_outbox_irq_handlers(dm->adev)) {
> DRM_ERROR("DM: Failed to initialize IRQ\n");
> --
> 2.30.2
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CRodrigo.Siqueira%40amd.com%7C25680479109e4017707308d91197df29%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637560166252532452%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=nDdFg7%2FPczkIeaw9vNoD4%2BctBPiyfYNIGsbKKZQCpEs%3D&reserved=0
--
Rodrigo Siqueira
https://siqueira.tech
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-10 21:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-07 20:36 [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Alex Deucher
2021-05-07 20:36 ` [PATCH 2/3] drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not defined Alex Deucher
2021-05-10 12:43 ` Shih, Jude
2021-05-07 20:36 ` [PATCH 3/3] drm/amdgpu/display: fix build " Alex Deucher
2021-05-10 12:43 ` Shih, Jude
2021-05-10 21:42 ` [PATCH 1/3] drm/amdgpu/display: remove an old DCN3 guard Rodrigo Siqueira
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).