Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:59:31 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core: amdgpu_dc.c
amdgpu_dc_link_hwss.c amdgpu_dc_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce: dce_audio.h
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100:
amdgpu_dce100_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110:
amdgpu_dce110_hw_sequencer.c 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
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10:
amdgpu_dcn10_hw_sequencer.c amdgpu_dcn10_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20:
amdgpu_dcn20_hwseq.c amdgpu_dcn20_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21:
amdgpu_dcn21_resource.c
Log Message:
amdgpu: Remove local ifdefs caused by audio.h header file confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc.c \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_hwss.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c
\
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21/amdgpu_dcn21_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/dist/drm/amd/display/dc/core/amdgpu_dc.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc.c:1.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc.c Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dc.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc.c,v 1.4 2021/12/19 11:59:30 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc.c,v 1.4 2021/12/19 11:59:30 riastradh Exp $");
#include <linux/slab.h>
#include <linux/mm.h>
@@ -2113,10 +2113,8 @@ static void commit_planes_do_stream_upda
if (*stream_update->dpms_off) {
core_link_disable_stream(pipe_ctx);
/* for dpms, keep acquired resources*/
-#ifndef __NetBSD__ /* XXX amdgpu audio */
if (pipe_ctx->stream_res.audio && !dc->debug.az_endpoint_mute_only)
pipe_ctx->stream_res.audio->funcs->az_disable(pipe_ctx->stream_res.audio);
-#endif
dc->hwss.optimize_bandwidth(dc, dc->current_state);
} else {
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_hwss.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_hwss.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_hwss.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_hwss.c:1.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_hwss.c Sun Dec 19 11:59:30 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: amdgpu_dc_link_hwss.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_link_hwss.c,v 1.4 2021/12/19 11:59:30 riastradh Exp $ */
/* Copyright 2015 Advanced Micro Devices, Inc. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_link_hwss.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_link_hwss.c,v 1.4 2021/12/19 11:59:30 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -334,10 +334,8 @@ void dp_retrain_link_dp_test(struct dc_l
dp_receiver_power_ctrl(link, false);
link->dc->hwss.disable_stream(&pipes[i]);
-#ifndef __NetBSD__ /* XXX amdgpu audio */
if ((&pipes[i])->stream_res.audio && !link->dc->debug.az_endpoint_mute_only)
(&pipes[i])->stream_res.audio->funcs->az_disable((&pipes[i])->stream_res.audio);
-#endif
link->link_enc->funcs->disable_output(
link->link_enc,
@@ -359,7 +357,6 @@ void dp_retrain_link_dp_test(struct dc_l
link->dc->hwss.unblank_stream(&pipes[i],
link_setting);
-#ifndef __NetBSD__ /* XXX amdgpu audio */
if (pipes[i].stream_res.audio) {
/* notify audio driver for
* audio modes of monitor */
@@ -373,7 +370,6 @@ void dp_retrain_link_dp_test(struct dc_l
audio_mute_control(
pipes[i].stream_res.stream_enc, false);
}
-#endif
}
}
}
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c:1.4 Sun Dec 19 10:59:36 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dc_resource.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_resource.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_resource.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_resource.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $");
#include <linux/slab.h>
@@ -209,7 +209,6 @@ void dc_destroy_resource_pool(struct dc
}
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
static void update_num_audio(
const struct resource_straps *straps,
unsigned int *num_audio,
@@ -236,7 +235,6 @@ static void update_num_audio(
DC_ERR("DC: unexpected audio fuse!\n");
}
}
-#endif
bool resource_construct(
unsigned int num_virtual_links,
@@ -254,9 +252,6 @@ bool resource_construct(
create_funcs->read_dce_straps(dc->ctx, &straps);
pool->audio_count = 0;
-#ifdef __NetBSD__ /* XXX amdgpu audio */
- __USE(num_audio);
-#else
if (create_funcs->create_audio) {
/* find the total number of streams available via the
* AZALIA_F0_CODEC_PIN_CONTROL_RESPONSE_CONFIGURATION_DEFAULT
@@ -281,7 +276,6 @@ bool resource_construct(
pool->audio_count++;
}
}
-#endif
pool->stream_enc_count = 0;
if (create_funcs->create_stream_encoder) {
@@ -1668,7 +1662,6 @@ static int acquire_first_free_pipe(
return -1;
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *find_first_free_audio(
struct resource_context *res_ctx,
const struct resource_pool *pool,
@@ -1700,7 +1693,6 @@ static struct audio *find_first_free_aud
}
return 0;
}
-#endif
bool resource_is_stream_unchanged(
struct dc_state *old_context, struct dc_stream_state *stream)
@@ -2023,7 +2015,6 @@ enum dc_status resource_map_pool_resourc
pipe_ctx->stream_res.stream_enc,
true);
-#ifndef __NetBSD__ /* XXX amdgpu audio */
/* TODO: Add check if ASIC support and EDID audio */
if (!stream->converter_disable_audio &&
dc_is_audio_capable_signal(pipe_ctx->stream->signal) &&
@@ -2040,7 +2031,6 @@ enum dc_status resource_map_pool_resourc
update_audio_usage(&context->res_ctx, pool,
pipe_ctx->stream_res.audio, true);
}
-#endif
/* Add ABM to the resource if on EDP */
if (pipe_ctx->stream && dc_is_embedded_signal(pipe_ctx->stream->signal))
@@ -2050,12 +2040,8 @@ enum dc_status resource_map_pool_resourc
if (context->streams[i] == stream) {
context->stream_status[i].primary_otg_inst = pipe_ctx->stream_res.tg->inst;
context->stream_status[i].stream_enc_inst = pipe_ctx->stream_res.stream_enc->id;
-#ifdef __NetBSD__ /* XXX amdgpu audio */
- context->stream_status[i].audio_inst = -1;
-#else
context->stream_status[i].audio_inst =
pipe_ctx->stream_res.audio ? pipe_ctx->stream_res.audio->inst : -1;
-#endif
return DC_OK;
}
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h:1.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/dce_audio.h Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dce_audio.h,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: dce_audio.h,v 1.4 2021/12/19 11:59:30 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -123,8 +123,6 @@ struct dce_audio_mask {
};
-#ifndef __NetBSD__ /* XXX amdgpu audio */
-
struct dce_audio {
struct audio base;
const struct dce_audio_registers *regs;
@@ -156,6 +154,4 @@ void dce_aud_wall_dto_setup(struct audio
const struct audio_crtc_info *crtc_info,
const struct audio_pll_info *pll_info);
-#endif
-
#endif /*__DAL_AUDIO_DCE_110_H__*/
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c:1.4 Sun Dec 19 10:59:37 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce100_resource.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce100_resource.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce100_resource.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce100_resource.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $");
#include <linux/slab.h>
@@ -290,7 +290,6 @@ 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)\
@@ -313,7 +312,6 @@ static const struct dce_audio_shift audi
static const struct dce_audio_mask audio_mask = {
AUD_COMMON_MASK_SH_LIST(_MASK)
};
-#endif
#define clk_src_regs(id)\
[id] = {\
@@ -451,12 +449,8 @@ static void read_dce_straps(
static struct audio *create_audio(
struct dc_context *ctx, unsigned int inst)
{
-#ifdef __NetBSD__ /* XXX amdgpu audio */
- return NULL;
-#else
return dce_audio_create(ctx, inst,
&audio_regs[inst], &audio_shift, &audio_mask);
-#endif
}
static struct timing_generator *dce100_timing_generator_create(
@@ -787,12 +781,10 @@ static void dce100_resource_destruct(str
if (pool->base.dp_clock_source != NULL)
dce100_clock_source_destroy(&pool->base.dp_clock_source);
-#ifndef __NetBSD__ /* XXX amdgpu audio */
for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i] != NULL)
dce_aud_destroy(&pool->base.audios[i]);
}
-#endif
if (pool->base.abm != NULL)
dce_abm_destroy(&pool->base.abm);
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c:1.4 Sun Dec 19 10:59:37 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.5 2021/12/19 11:59:30 riastradh Exp $");
#include <linux/delay.h>
@@ -689,13 +689,11 @@ void dce110_enable_stream(struct pipe_ct
tg->funcs->set_early_control(tg, early_control);
-#ifndef __NetBSD__ /* XXX amdgpu audio */
/* enable audio only within mode set */
if (pipe_ctx->stream_res.audio != NULL) {
if (dc_is_dp_signal(pipe_ctx->stream->signal))
pipe_ctx->stream_res.stream_enc->funcs->dp_audio_enable(pipe_ctx->stream_res.stream_enc);
}
-#endif
@@ -950,7 +948,6 @@ void dce110_edp_backlight_control(
void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx)
{
-#ifndef __NetBSD__ /* XXX amdgpu audio */
/* notify audio driver for audio modes of monitor */
struct dc *dc;
struct clk_mgr *clk_mgr;
@@ -984,12 +981,10 @@ void dce110_enable_audio_stream(struct p
if (pipe_ctx->stream_res.audio)
pipe_ctx->stream_res.audio->enabled = true;
}
-#endif
}
void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx)
{
-#ifndef __NetBSD__ /* XXX amdgpu audio */
struct dc *dc;
struct clk_mgr *clk_mgr;
@@ -1024,7 +1019,6 @@ void dce110_disable_audio_stream(struct
* stream->stream_engine_id);
*/
}
-#endif
}
void dce110_disable_stream(struct pipe_ctx *pipe_ctx)
@@ -1095,7 +1089,6 @@ void dce110_set_avmute(struct pipe_ctx *
pipe_ctx->stream_res.stream_enc->funcs->set_avmute(pipe_ctx->stream_res.stream_enc, enable);
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
static enum audio_dto_source translate_to_dto_source(enum controller_id crtc_id)
{
switch (crtc_id) {
@@ -1197,7 +1190,6 @@ static void build_audio_output(
audio_output->pll_info.ss_percentage =
pipe_ctx->pll_settings.ss_percentage;
}
-#endif
static void get_surface_visual_confirm_color(const struct pipe_ctx *pipe_ctx,
struct tg_color *color)
@@ -1345,7 +1337,6 @@ static enum dc_status apply_single_contr
hws->funcs.disable_stream_gating(dc, pipe_ctx);
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
if (pipe_ctx->stream_res.audio != NULL) {
struct audio_output audio_output;
@@ -1369,7 +1360,6 @@ static enum dc_status apply_single_contr
&audio_output.crtc_info,
&pipe_ctx->stream->audio_info);
}
-#endif
/* */
/* Do not touch stream timing on seamless boot optimization. */
@@ -1909,7 +1899,6 @@ static void dce110_reset_hw_ctx_wrap(
if (!pipe_ctx->stream || !pipe_ctx->stream->dpms_off) {
core_link_disable_stream(pipe_ctx_old);
-#ifndef __NetBSD__ /* XXX amdgpu audio */
/* free acquired resources*/
if (pipe_ctx_old->stream_res.audio) {
/*disable az_endpoint*/
@@ -1925,7 +1914,6 @@ static void dce110_reset_hw_ctx_wrap(
pipe_ctx_old->stream_res.audio = NULL;
}
}
-#endif
}
pipe_ctx_old->stream_res.tg->funcs->set_blank(pipe_ctx_old->stream_res.tg, true);
@@ -1986,7 +1974,6 @@ static void dce110_setup_audio_dto(
if (pipe_ctx->stream->signal != SIGNAL_TYPE_HDMI_TYPE_A)
continue;
-#ifndef __NetBSD__ /* XXX amdgpu audio */
if (pipe_ctx->stream_res.audio != NULL) {
struct audio_output audio_output;
@@ -1999,7 +1986,6 @@ static void dce110_setup_audio_dto(
&audio_output.pll_info);
break;
}
-#endif
}
/* no HDMI audio is found, try DP audio */
@@ -2016,7 +2002,6 @@ static void dce110_setup_audio_dto(
if (!dc_is_dp_signal(pipe_ctx->stream->signal))
continue;
-#ifndef __NetBSD__ /* XXX amdgpu audio */
if (pipe_ctx->stream_res.audio != NULL) {
struct audio_output audio_output;
@@ -2029,7 +2014,6 @@ static void dce110_setup_audio_dto(
&audio_output.pll_info);
break;
}
-#endif
}
}
}
@@ -2421,12 +2405,10 @@ static void init_hw(struct dc *dc)
hwss_wait_for_blank_complete(tg);
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
for (i = 0; i < dc->res_pool->audio_count; i++) {
struct audio *audio = dc->res_pool->audios[i];
audio->funcs->hw_init(audio);
}
-#endif
abm = dc->res_pool->abm;
if (abm != NULL) {
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.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c:1.3 Sun Dec 19 11:22:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_resource.c Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce110_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce110_resource.c,v 1.4 2021/12/19 11:59:30 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.3 2021/12/19 11:22:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_resource.c,v 1.4 2021/12/19 11:59:30 riastradh Exp $");
#include <linux/slab.h>
@@ -325,8 +325,6 @@ 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)\
@@ -350,8 +348,6 @@ 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. */
@@ -499,14 +495,12 @@ 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,
@@ -576,9 +570,7 @@ 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,
};
@@ -849,9 +841,7 @@ 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.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c:1.3 Sun Dec 19 11:22:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce112/amdgpu_dce112_resource.c Sun Dec 19 11:59:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce112_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce112_resource.c,v 1.4 2021/12/19 11:59:30 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.3 2021/12/19 11:22:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce112_resource.c,v 1.4 2021/12/19 11:59:30 riastradh Exp $");
#include <linux/slab.h>
@@ -332,8 +332,6 @@ 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)\
@@ -356,8 +354,6 @@ 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),\
@@ -476,15 +472,12 @@ 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(
struct dc_context *ctx,
@@ -548,9 +541,7 @@ 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,
};
@@ -811,9 +802,7 @@ 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.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c:1.3 Sun Dec 19 11:22:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_resource.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce120_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce120_resource.c,v 1.4 2021/12/19 11:59:31 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.3 2021/12/19 11:22:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce120_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/slab.h>
@@ -342,8 +342,6 @@ 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)\
@@ -371,8 +369,6 @@ 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)
{
@@ -639,10 +635,8 @@ 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++) {
@@ -685,14 +679,12 @@ 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,
@@ -818,18 +810,14 @@ 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.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c:1.3 Sun Dec 19 11:22:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_resource.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce80_resource.c,v 1.3 2021/12/19 11:22:51 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce80_resource.c,v 1.4 2021/12/19 11:59:31 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.3 2021/12/19 11:22:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce80_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/slab.h>
@@ -316,8 +316,6 @@ 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)\
@@ -341,8 +339,6 @@ 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),\
@@ -490,14 +486,12 @@ 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,
@@ -643,9 +637,7 @@ 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,
};
@@ -846,9 +838,7 @@ 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
}
}
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.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c:1.3 Sun Dec 19 11:24:44 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.3 2021/12/19 11:24:44 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.4 2021/12/19 11:59:31 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.3 2021/12/19 11:24:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_hw_sequencer.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/delay.h>
#include "dm_services.h"
@@ -886,7 +886,6 @@ 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);
@@ -898,7 +897,6 @@ static void dcn10_reset_back_end_for_pip
pipe_ctx->stream_res.audio, false);
pipe_ctx->stream_res.audio = NULL;
}
-#endif /* __NetBSD__ */
}
}
@@ -1335,11 +1333,9 @@ 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) {
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c:1.3 Sun Dec 19 11:26:14 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_resource.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_resource.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/slab.h>
@@ -256,8 +256,6 @@ static const struct dcn10_stream_encoder
SE_COMMON_MASK_SH_LIST_DCN10(_MASK)
};
-#ifndef __NetBSD__ /* XXX amdgpu audio */
-
#define audio_regs(id)\
[id] = {\
AUD_COMMON_REG_LIST(id)\
@@ -283,8 +281,6 @@ static const struct dce_audio_mask audio
DCE120_AUD_COMMON_MASK_SH_LIST(_MASK)
};
-#endif
-
#define aux_regs(id)\
[id] = {\
AUX_REG_LIST(id)\
@@ -847,14 +843,12 @@ static void read_dce_straps(
FN(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 stream_encoder *dcn10_stream_encoder_create(
enum engine_id eng_id,
@@ -903,18 +897,14 @@ static struct dce_hwseq *dcn10_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 = dcn10_stream_encoder_create,
.create_hwseq = dcn10_hwseq_create,
};
static const struct resource_create_funcs res_create_maximus_funcs = {
.read_dce_straps = NULL,
-#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = NULL,
-#endif
.create_stream_encoder = NULL,
.create_hwseq = dcn10_hwseq_create,
};
@@ -996,10 +986,8 @@ static void dcn10_resource_destruct(stru
}
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.clk_src_count; i++) {
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c:1.3 Sun Dec 19 11:26:14 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn20_hwseq.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn20_hwseq.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_hwseq.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_hwseq.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/delay.h>
@@ -2035,7 +2035,6 @@ static void dcn20_reset_back_end_for_pip
/* free acquired resources */
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);
@@ -2047,7 +2046,6 @@ static void dcn20_reset_back_end_for_pip
pipe_ctx->stream_res.audio, false);
pipe_ctx->stream_res.audio = NULL;
}
-#endif
}
}
else if (pipe_ctx->stream_res.dsc) {
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.3 Sun Dec 19 11:26:14 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn20_resource.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn20_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/slab.h>
@@ -473,8 +473,6 @@ static const struct dce_abm_mask abm_mas
ABM_MASK_SH_LIST_DCN20(_MASK)
};
-#ifndef __NetBSD__ /* XXX amdgpu */
-
#define audio_regs(id)\
[id] = {\
AUD_COMMON_REG_LIST(id)\
@@ -503,8 +501,6 @@ static const struct dce_audio_mask audio
DCE120_AUD_COMMON_MASK_SH_LIST(_MASK)
};
-#endif /* __NetBSD__ */
-
#define stream_enc_regs(id)\
[id] = {\
SE_DCN2_REG_LIST(id)\
@@ -1215,14 +1211,12 @@ static void read_dce_straps(
FN(DC_PINSTRAPS, DC_PINSTRAPS_AUDIO), &straps->dc_pinstraps_audio);
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *dcn20_create_audio(
struct dc_context *ctx, unsigned int inst)
{
return dce_audio_create(ctx, inst,
&audio_regs[inst], &audio_shift, &audio_mask);
}
-#endif
struct stream_encoder *dcn20_stream_encoder_create(
enum engine_id eng_id,
@@ -1274,18 +1268,14 @@ struct dce_hwseq *dcn20_hwseq_create(
static const struct resource_create_funcs res_create_funcs = {
.read_dce_straps = read_dce_straps,
-#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = dcn20_create_audio,
-#endif
.create_stream_encoder = dcn20_stream_encoder_create,
.create_hwseq = dcn20_hwseq_create,
};
static const struct resource_create_funcs res_create_maximus_funcs = {
.read_dce_straps = NULL,
-#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = NULL,
-#endif
.create_stream_encoder = NULL,
.create_hwseq = dcn20_hwseq_create,
};
@@ -1399,10 +1389,8 @@ static void dcn20_resource_destruct(stru
}
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.clk_src_count; i++) {
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21/amdgpu_dcn21_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21/amdgpu_dcn21_resource.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21/amdgpu_dcn21_resource.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21/amdgpu_dcn21_resource.c:1.3 Sun Dec 19 11:35:07 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn21/amdgpu_dcn21_resource.c Sun Dec 19 11:59:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn21_resource.c,v 1.3 2021/12/19 11:35:07 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn21_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $ */
/*
* Copyright 2018 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn21_resource.c,v 1.3 2021/12/19 11:35:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn21_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
#include <linux/slab.h>
@@ -943,12 +943,10 @@ static void dcn21_resource_destruct(stru
}
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i])
dce_aud_destroy(&pool->base.audios[i]);
}
-#endif
for (i = 0; i < pool->base.clk_src_count; i++) {
if (pool->base.clock_sources[i] != NULL) {
@@ -1432,14 +1430,12 @@ static void dcn21_pp_smu_destroy(struct
}
}
-#ifndef __NetBSD__ /* XXX amdgpu audio */
static struct audio *dcn21_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 dc_cap_funcs cap_funcs = {
.get_dcc_compression_cap = dcn20_get_dcc_compression_cap
@@ -1491,9 +1487,7 @@ static struct dce_hwseq *dcn21_hwseq_cre
static const struct resource_create_funcs res_create_funcs = {
.read_dce_straps = read_dce_straps,
-#ifndef __NetBSD__ /* XXX amdgpu audio */
.create_audio = dcn21_create_audio,
-#endif
.create_stream_encoder = dcn21_stream_encoder_create,
.create_hwseq = dcn21_hwseq_create,
};
