Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:24:44 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10:
amdgpu_dcn10_hw_sequencer.c
Log Message:
amdgpu: Ifdef out audio for now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c Sun Dec 19 11:24:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.3 2021/12/19 11:24:44 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.3 2021/12/19 11:24:44 riastradh Exp $");
#include <linux/delay.h>
#include "dm_services.h"
@@ -886,6 +886,7 @@ static void dcn10_reset_back_end_for_pip
dc->hwss.disable_audio_stream(pipe_ctx);
if (pipe_ctx->stream_res.audio) {
+#ifndef __NetBSD__ /* XXX amdgpu audio */
/*disable az_endpoint*/
pipe_ctx->stream_res.audio->funcs->az_disable(pipe_ctx->stream_res.audio);
@@ -897,6 +898,7 @@ static void dcn10_reset_back_end_for_pip
pipe_ctx->stream_res.audio, false);
pipe_ctx->stream_res.audio = NULL;
}
+#endif /* __NetBSD__ */
}
}
@@ -1333,9 +1335,11 @@ void dcn10_init_hw(struct dc *dc)
}
for (i = 0; i < res_pool->audio_count; i++) {
+#ifndef __NetBSD__ /* XXX amdgpu audio */
struct audio *audio = res_pool->audios[i];
audio->funcs->hw_init(audio);
+#endif
}
if (abm != NULL) {
