Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10 amdgpu: ...



details:   https://anonhg.NetBSD.org/src/rev/749ad91d86be
branches:  trunk
changeset: 1028597:749ad91d86be
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:24:44 2021 +0000

description:
amdgpu: Ifdef out audio for now.

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r 7ee9f29ea9f0 -r 749ad91d86be sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c
--- a/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c   Sun Dec 19 11:24:37 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c   Sun Dec 19 11:24:44 2021 +0000
@@ -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 @@
                        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 @@
                                                pipe_ctx->stream_res.audio, false);
                                pipe_ctx->stream_res.audio = NULL;
                        }
+#endif /* __NetBSD__ */
                }
        }
 
@@ -1333,9 +1335,11 @@
        }
 
        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) {



Home | Main Index | Thread Index | Old Index