Skip to contentSkip to conversation

drm/amdgpu/display: fix the build without CONFIG_DRM_AMD_DC_DSC_SUPPORT

PATCH In review Alex Deucher 2 participants 2 messages Jul 26, 2019 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/display: fix the build without CONFIG_DRM_AMD_DC_DSC_SUPPORT

Some code was missing the CONFIG_DRM_AMD_DC_DSC_SUPPORT guard.

---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +2 -0
index 69e4d0d96c7f..38b3c89b2a59 100644
@@ -630,9 +630,11 @@ static void dcn20_init_hw(struct dc *dc)
 		}
 	}
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
 	/* Power gate DSCs */
 	for (i = 0; i < res_pool->res_cap->num_dsc; i++)
 		dcn20_dsc_pg_control(hws, res_pool->dscs[i]->inst, false);
+#endif
 
 	/* Blank pixel data with OPP DPG */
 	for (i = 0; i < dc->res_pool->timing_generator_count; i++) {
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20190726160906.6705-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org

Reviewed-by Nicholas Kazlauskas
#2 lore raw
Quoted 3 lines · Alex Deucher

Some code was missing the CONFIG_DRM_AMD_DC_DSC_SUPPORT guard.

We probably want to drop this and the DCN2 guard eventually though.

Nicholas Kazlauskas

Quoted 11 lines
---
  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +0 -0
index 69e4d0d96c7f..38b3c89b2a59 100644
@@ -630,9 +630,11 @@ static void dcn20_init_hw(struct dc *dc)
  		}

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c static void dcn20_init_hw(struct dc *dc) · line 640

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +2 -0
  	}
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
  	/* Power gate DSCs */
  	for (i = 0; i < res_pool->res_cap->num_dsc; i++)
  		dcn20_dsc_pg_control(hws, res_pool->dscs[i]->inst, false);
+#endif
 
  	/* Blank pixel data with OPP DPG */
  	for (i = 0; i < dc->res_pool->timing_generator_count; i++) {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx