public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio()
@ 2023-05-23  8:34 Arnd Bergmann
  2023-05-23 14:37 ` Hamza Mahfooz
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2023-05-23  8:34 UTC (permalink / raw)
  To: Harry Wentland, Leo Li, Rodrigo Siqueira, Alex Deucher,
	Christian König, Pan, Xinhui, David Airlie, Daniel Vetter,
	Tom Chung, Nicholas Kazlauskas, Saaem Rizvi
  Cc: Arnd Bergmann, Wenjing Liu, Jun Lei, Charlene Liu, Alvin Lee,
	Mario Limonciello, Jingwen Zhu, Nagulendran, Iswara, amd-gfx,
	dri-devel, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>

The .resync_fifo_dccg_dio() callback pointer was added in an #ifdef block,
but is called unconditionally:

drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_hw_sequencer.c:2292:31: error: 'struct hwseq_private_funcs' has no member named 'resync_fifo_dccg_dio'

Add the same #ifdef around the caller as well.

Fixes: 6354b0dc3a7a ("drm/amd/display: Trigger DIO FIFO resync on commit streams")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index c6fe2c00aedb..d4cacb8df631 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -2289,8 +2289,10 @@ enum dc_status dce110_apply_ctx_to_hw(
 		if (DC_OK != status)
 			return status;
 
+#ifdef CONFIG_DRM_AMD_DC_FP
 		if (hws->funcs.resync_fifo_dccg_dio)
 			hws->funcs.resync_fifo_dccg_dio(hws, dc, context);
+#endif
 	}
 
 	if (dc->fbc_compressor)
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio()
  2023-05-23  8:34 [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio() Arnd Bergmann
@ 2023-05-23 14:37 ` Hamza Mahfooz
  0 siblings, 0 replies; 2+ messages in thread
From: Hamza Mahfooz @ 2023-05-23 14:37 UTC (permalink / raw)
  To: Arnd Bergmann, Harry Wentland, Leo Li, Rodrigo Siqueira,
	Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
	Daniel Vetter, Tom Chung, Nicholas Kazlauskas, Saaem Rizvi
  Cc: Charlene Liu, Jingwen Zhu, Arnd Bergmann, Nagulendran, Iswara,
	dri-devel, Wenjing Liu, linux-kernel, amd-gfx, Alvin Lee, Jun Lei,
	Mario Limonciello

On 5/23/23 04:34, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The .resync_fifo_dccg_dio() callback pointer was added in an #ifdef block,
> but is called unconditionally:
> 
> drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_hw_sequencer.c:2292:31: error: 'struct hwseq_private_funcs' has no member named 'resync_fifo_dccg_dio'
> 
> Add the same #ifdef around the caller as well.
> 
> Fixes: 6354b0dc3a7a ("drm/amd/display: Trigger DIO FIFO resync on commit streams")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied, thanks!

> ---
>   drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
> index c6fe2c00aedb..d4cacb8df631 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
> @@ -2289,8 +2289,10 @@ enum dc_status dce110_apply_ctx_to_hw(
>   		if (DC_OK != status)
>   			return status;
>   
> +#ifdef CONFIG_DRM_AMD_DC_FP
>   		if (hws->funcs.resync_fifo_dccg_dio)
>   			hws->funcs.resync_fifo_dccg_dio(hws, dc, context);
> +#endif
>   	}
>   
>   	if (dc->fbc_compressor)
-- 
Hamza


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-05-23 14:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-23  8:34 [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio() Arnd Bergmann
2023-05-23 14:37 ` Hamza Mahfooz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox