Skip to contentSkip to conversation

drm/amdgpu/display: fix build when DCN KCONFIG is not set

PATCH In review Alex Deucher 2 participants 2 messages Mar 20, 2019 – Mar 21, 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 DCN KCONFIG is not set

Leads to an undefined symbol otherwise.

---
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +4 -0
index 4af3545fc414..f7a293902234 100644
@@ -29,7 +29,9 @@
 #include "resource.h"
 #include "ipp.h"
 #include "timing_generator.h"
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 #include "dcn10/dcn10_hw_sequencer.h"
+#endif
 
 #define DC_LOGGER dc->ctx->logger
 
@@ -199,6 +201,7 @@ struct dc_stream_status *dc_stream_get_status(
 
 static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)
 {
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 	unsigned int vupdate_line;
 	unsigned int lines_to_vupdate, us_to_vupdate, vpos, nvpos;
 	struct dc_stream_state *stream = pipe_ctx->stream;
@@ -221,6 +224,7 @@ static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)
 		if (us_to_vupdate < 70)
 			udelay(us_to_vupdate);
 	}
+#endif
 }
 
 /**
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): 20190320212213.4149-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org

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

Leads to an undefined symbol otherwise.

Quoted 28 lines
---
  drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++++
  1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +3 -0
index 4af3545fc414..f7a293902234 100644
@@ -29,7 +29,9 @@
  #include "resource.h"
  #include "ipp.h"
  #include "timing_generator.h"
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
  #include "dcn10/dcn10_hw_sequencer.h"
+#endif
 
  #define DC_LOGGER dc->ctx->logger
 
@@ -199,6 +201,7 @@ struct dc_stream_status *dc_stream_get_status(
 
  static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)
  {
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
  	unsigned int vupdate_line;
  	unsigned int lines_to_vupdate, us_to_vupdate, vpos, nvpos;
  	struct dc_stream_state *stream = pipe_ctx->stream;

drivers/gpu/drm/amd/display/dc/core/dc_stream.c static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc) · line 230

Quoted 7 lines
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +1 -0
@@ -221,6 +224,7 @@ static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)
  		if (us_to_vupdate < 70)
  			udelay(us_to_vupdate);
  	}
+#endif
  }
 
  /**

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