drm/amd/display: Fix "dc has no member named dml" compile error
authorLeo Li <sunpeng.li@amd.com>
Thu, 21 Mar 2019 14:36:07 +0000 (10:36 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 3 Apr 2019 16:57:14 +0000 (11:57 -0500)
For DCN disabled builds, dc->dml is stripped out. Therefore, guard usage
in dc_create_state() with CONFIG_DRM_AMD_DC_DCN1_0.

It fixes the following error:

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c: In function 'dc_create_state':
>> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1237:34: error: 'struct dc' has no member named 'dml'
     memcpy(&context->bw_ctx.dml, &dc->dml, sizeof(struct display_mode_lib));
                                     ^~

Signed-off-by: Leo Li <sunpeng.li@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc.c

index 1c1cfb51362014bad1a4d172b0c583d24c3a562a..5f05e191f0ff49db7adc3457ad6882dd854b9314 100644 (file)
@@ -1229,7 +1229,9 @@ struct dc_state *dc_create_state(struct dc *dc)
         * initialize and obtain IP and SOC the base DML instance from DC is
         * initially copied into every context
         */
+#ifdef CONFIG_DRM_AMD_DC_DCN1_0
        memcpy(&context->bw_ctx.dml, &dc->dml, sizeof(struct display_mode_lib));
+#endif
 
        kref_init(&context->refcount);