2023-05-23 08:57:04

by Arnd Bergmann

Subject: [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio()

From: Arnd Bergmann <[email protected]>

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 <[email protected]>
---
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

2023-05-23 14:55:32

by Hamza Mahfooz

Subject: Re: [PATCH] drm/amd/display: avoid calling missing .resync_fifo_dccg_dio()

On 5/23/23 04:34, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>

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