Skip to contentSkip to conversation

drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DSC_SUPPORT=n

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

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

PATCH 1/1 drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DSC_SUPPORT=n

Add proper config check.

---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +2 -0
index 914e378bcda4..4f0331810696 100644
@@ -1910,8 +1910,10 @@ int dcn20_populate_dml_pipes_from_context(
 			pipes[pipe_cnt].dout.output_bpp = output_bpc * 3;
 		}
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
 		if (res_ctx->pipe_ctx[i].stream->timing.flags.DSC)
 			pipes[pipe_cnt].dout.output_bpp = res_ctx->pipe_ctx[i].stream->timing.dsc_cfg.bits_per_pixel / 16.0;
+#endif
 
 		/* todo: default max for now, until there is logic reflecting this in dc*/
 		pipes[pipe_cnt].dout.output_bpc = 12;
Signature · 6 lines
2.23.0

_______________________________________________
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): 20191016161343.698656-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 23 lines · Alex Deucher

Add proper config check.

---
  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +2 -0
index 914e378bcda4..4f0331810696 100644
@@ -1910,8 +1910,10 @@ int dcn20_populate_dml_pipes_from_context(
  			pipes[pipe_cnt].dout.output_bpp = output_bpc * 3;
  		}
 
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
  		if (res_ctx->pipe_ctx[i].stream->timing.flags.DSC)
  			pipes[pipe_cnt].dout.output_bpp = res_ctx->pipe_ctx[i].stream->timing.dsc_cfg.bits_per_pixel / 16.0;
+#endif
 
  		/* todo: default max for now, until there is logic reflecting this in dc*/
  		pipes[pipe_cnt].dout.output_bpc = 12;
Signature · 8 lines
Thanks,
Mikita Lipski
Software Engineer, AMD
[email protected]
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx