diff mbox series

drm/amd/display: avoid calling missing .resync_fifo_dccg_dio()

Message ID 20230523083437.986490-1-arnd@kernel.org
State New
Headers
Series drm/amd/display: avoid calling missing .resync_fifo_dccg_dio() |

Commit Message

Arnd Bergmann May 23, 2023, 8:34 a.m. UTC 
  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(+)

Comments

Hamza Mahfooz May 23, 2023, 2:37 p.m. UTC | #1 
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)
diff mbox series

Patch

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)