OSDN Git Service

drm/amd/display: avoid calling missing .resync_fifo_dccg_dio()
authorArnd Bergmann <arnd@arndb.de>
Tue, 23 May 2023 08:34:30 +0000 (10:34 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 9 Jun 2023 14:53:09 +0000 (10:53 -0400)
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: 3e8d74cb128f ("drm/amd/display: Trigger DIO FIFO resync on commit streams")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

index c6fe2c0..d4cacb8 100644 (file)
@@ -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)