Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:22:51 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110:
amdgpu_dce110_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112:
amdgpu_dce112_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120:
amdgpu_dce120_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80:
amdgpu_dce80_resource.c
Log Message:
amdgpu: Ifdef out audio stuff for now.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.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/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.15 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.16
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.15 Sun Dec 19 10:59:36 2021
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Dec 19 11:22:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.amdgpu,v 1.15 2021/12/19 10:59:36 riastradh Exp $
+# $NetBSD: files.amdgpu,v 1.16 2021/12/19 11:22:51 riastradh Exp $
version 20180827
@@ -112,7 +112,7 @@ file external/bsd/drm2/dist/drm/amd/amdg
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/core/amdgpu_dc_surface.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/core/amdgpu_dc_vm_helper.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_abm.c amdgpu
-file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_audio.c amdgpu
+#file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_audio.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_aux.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_clock_source.c amdgpu
file external/bsd/drm2/dist/drm/amd/amdgpu/../display/dc/dce/amdgpu_dce_dmcu.c amdgpu
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c:1.2 Sat Dec 18 23:45:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c Sun Dec 19 11:22:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce110_resource.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce110_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_resource.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $");
#include <linux/slab.h>
@@ -325,6 +325,8 @@ static const struct dce110_aux_registers
aux_engine_regs(5)
};
+#ifndef __NetBSD__ /* XXX amdgpu audio */
+
#define audio_regs(id)\
[id] = {\
AUD_COMMON_REG_LIST(id)\
@@ -348,6 +350,8 @@ static const struct dce_audio_mask audio
AUD_COMMON_MASK_SH_LIST(_MASK)
};
+#endif /* __NetBSD__ */
+
/* AG TBD Needs to be reduced back to 3 pipes once dce10 hw sequencer implemented. */
@@ -495,12 +499,14 @@ static void read_dce_straps(
REG_GET(DC_PINSTRAPS, DC_PINSTRAPS_AUDIO, &straps->dc_pinstraps_audio);
}
+#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *create_audio(
struct dc_context *ctx, unsigned int inst)
{
return dce_audio_create(ctx, inst,
&audio_regs[inst], &audio_shift, &audio_mask);
}
+#endif
static struct timing_generator *dce110_timing_generator_create(
struct dc_context *ctx,
@@ -570,7 +576,9 @@ static struct dce_hwseq *dce110_hwseq_cr
static const struct resource_create_funcs res_create_funcs = {
.read_dce_straps = read_dce_straps,
+#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = create_audio,
+#endif
.create_stream_encoder = dce110_stream_encoder_create,
.create_hwseq = dce110_hwseq_create,
};
@@ -841,7 +849,9 @@ static void dce110_resource_destruct(str
for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i] != NULL) {
+#ifndef __NetBSD__ /* XXX amdgpu audio */
dce_aud_destroy(&pool->base.audios[i]);
+#endif
}
}
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c Sun Dec 19 11:22:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce112_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce112_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce112_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce112_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $");
#include <linux/slab.h>
@@ -332,6 +332,8 @@ static const struct dce110_aux_registers
aux_engine_regs(5)
};
+#ifndef __NetBSD__ /* XXX amdgpu audio */
+
#define audio_regs(id)\
[id] = {\
AUD_COMMON_REG_LIST(id)\
@@ -354,6 +356,8 @@ static const struct dce_audio_mask audio
AUD_COMMON_MASK_SH_LIST(_MASK)
};
+#endif /* __NetBSD__ */
+
#define clk_src_regs(index, id)\
[index] = {\
CS_COMMON_REG_LIST_DCE_112(id),\
@@ -472,12 +476,14 @@ static void read_dce_straps(
REG_GET(DC_PINSTRAPS, DC_PINSTRAPS_AUDIO, &straps->dc_pinstraps_audio);
}
+#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *create_audio(
struct dc_context *ctx, unsigned int inst)
{
return dce_audio_create(ctx, inst,
&audio_regs[inst], &audio_shift, &audio_mask);
}
+#endif
static struct timing_generator *dce112_timing_generator_create(
@@ -542,7 +548,9 @@ static struct dce_hwseq *dce112_hwseq_cr
static const struct resource_create_funcs res_create_funcs = {
.read_dce_straps = read_dce_straps,
+#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = create_audio,
+#endif
.create_stream_encoder = dce112_stream_encoder_create,
.create_hwseq = dce112_hwseq_create,
};
@@ -803,7 +811,9 @@ static void dce112_resource_destruct(str
for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i] != NULL) {
+#ifndef __NetBSD__ /* XXX amdgpu audio */
dce_aud_destroy(&pool->base.audios[i]);
+#endif
}
}
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c Sun Dec 19 11:22:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce120_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce120_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.cls
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce120_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce120_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $");
#include <linux/slab.h>
@@ -342,6 +342,8 @@ static const struct dce110_aux_registers
aux_engine_regs(5)
};
+#ifndef __NetBSD__ /* XXX amdgpu audio */
+
#define audio_regs(id)\
[id] = {\
AUD_COMMON_REG_LIST(id)\
@@ -369,6 +371,8 @@ static const struct dce_audio_mask audio
DCE120_AUD_COMMON_MASK_SH_LIST(_MASK)
};
+#endif /* __NetBSD__ */
+
static int map_transmitter_id_to_phy_instance(
enum transmitter transmitter)
{
@@ -635,8 +639,10 @@ static void dce120_resource_destruct(str
}
for (i = 0; i < pool->base.audio_count; i++) {
+#ifndef __NetBSD__ /* XXX amdgpu audio */
if (pool->base.audios[i])
dce_aud_destroy(&pool->base.audios[i]);
+#endif
}
for (i = 0; i < pool->base.stream_enc_count; i++) {
@@ -679,12 +685,14 @@ static void read_dce_straps(
DC_PINSTRAPS_AUDIO);
}
+#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *create_audio(
struct dc_context *ctx, unsigned int inst)
{
return dce_audio_create(ctx, inst,
&audio_regs[inst], &audio_shift, &audio_mask);
}
+#endif
static const struct encoder_feature_support link_enc_feature = {
.max_hdmi_deep_color = COLOR_DEPTH_121212,
@@ -810,14 +818,18 @@ static struct dce_hwseq *dce121_hwseq_cr
static const struct resource_create_funcs res_create_funcs = {
.read_dce_straps = read_dce_straps,
+#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = create_audio,
+#endif
.create_stream_encoder = dce120_stream_encoder_create,
.create_hwseq = dce120_hwseq_create,
};
static const struct resource_create_funcs dce121_res_create_funcs = {
.read_dce_straps = read_dce_straps,
+#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = create_audio,
+#endif
.create_stream_encoder = dce120_stream_encoder_create,
.create_hwseq = dce121_hwseq_create,
};
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c Sun Dec 19 11:22:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce80_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce80_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce80_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce80_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $");
#include <linux/slab.h>
@@ -316,6 +316,8 @@ static const struct dce110_aux_registers
aux_engine_regs(5)
};
+#ifndef __NetBSD__ /* XXX amdgpu audio */
+
#define audio_regs(id)\
[id] = {\
AUD_COMMON_REG_LIST(id)\
@@ -339,6 +341,8 @@ static const struct dce_audio_mask audio
AUD_COMMON_MASK_SH_LIST(_MASK)
};
+#endif /* __NetBSD__ */
+
#define clk_src_regs(id)\
[id] = {\
CS_COMMON_REG_LIST_DCE_80(id),\
@@ -486,12 +490,14 @@ static void read_dce_straps(
REG_GET(DC_PINSTRAPS, DC_PINSTRAPS_AUDIO, &straps->dc_pinstraps_audio);
}
+#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *create_audio(
struct dc_context *ctx, unsigned int inst)
{
return dce_audio_create(ctx, inst,
&audio_regs[inst], &audio_shift, &audio_mask);
}
+#endif
static struct timing_generator *dce80_timing_generator_create(
struct dc_context *ctx,
@@ -637,7 +643,9 @@ static struct dce_hwseq *dce80_hwseq_cre
static const struct resource_create_funcs res_create_funcs = {
.read_dce_straps = read_dce_straps,
+#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = create_audio,
+#endif
.create_stream_encoder = dce80_stream_encoder_create,
.create_hwseq = dce80_hwseq_create,
};
@@ -838,7 +846,9 @@ static void dce80_resource_destruct(stru
for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i] != NULL) {
+#ifndef __NetBSD__ /* XXX amdgpu audio */
dce_aud_destroy(&pool->base.audios[i]);
+#endif
}
}
