Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:26:14 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_gem.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10:
amdgpu_dcn10_resource.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20:
amdgpu_dcn20_hwseq.c amdgpu_dcn20_resource.c
Log Message:
drm/gem: Comment obscure constant parameters.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/dist/drm/drm_gem.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c
cvs rdiff -u -r1.2 -r1.3 \
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
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/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.20 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.20 Sun Dec 19 11:07:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Sun Dec 19 11:26:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem.c,v 1.20 2021/12/19 11:07:28 riastradh Exp $ */
+/* $NetBSD: drm_gem.c,v 1.21 2021/12/19 11:26:14 riastradh Exp $ */
/*
* Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.20 2021/12/19 11:07:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.21 2021/12/19 11:26:14 riastradh Exp $");
#include <linux/types.h>
#include <linux/slab.h>
@@ -188,7 +188,8 @@ void drm_gem_private_object_init(struct
obj->filp = NULL;
KASSERT(drm_core_check_feature(dev, DRIVER_GEM));
KASSERT(dev->driver->gem_uvm_ops != NULL);
- uvm_obj_init(&obj->gemo_uvmobj, dev->driver->gem_uvm_ops, true, 1);
+ uvm_obj_init(&obj->gemo_uvmobj, dev->driver->gem_uvm_ops,
+ /*allocate lock*/true, /*nrefs*/1);
#else
obj->filp = NULL;
#endif
@@ -1065,7 +1066,7 @@ drm_gem_object_release(struct drm_gem_ob
drm_vma_node_destroy(&obj->vma_node);
if (obj->filp)
uao_detach(obj->filp);
- uvm_obj_destroy(&obj->gemo_uvmobj, true);
+ uvm_obj_destroy(&obj->gemo_uvmobj, /*free lock*/true);
#else
if (obj->filp)
fput(obj->filp);
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.2 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.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_resource.c Sun Dec 19 11:26:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_resource.c,v 1.3 2021/12/19 11:26:14 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.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_resource.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $");
#include <linux/slab.h>
@@ -256,6 +256,8 @@ 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)\
@@ -281,6 +283,8 @@ static const struct dce_audio_mask audio
DCE120_AUD_COMMON_MASK_SH_LIST(_MASK)
};
+#endif
+
#define aux_regs(id)\
[id] = {\
AUX_REG_LIST(id)\
@@ -843,12 +847,14 @@ 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,
@@ -897,14 +903,18 @@ 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,
};
@@ -986,8 +996,10 @@ 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.2 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.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_hwseq.c Sun Dec 19 11:26:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn20_hwseq.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn20_hwseq.c,v 1.3 2021/12/19 11:26:14 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.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_hwseq.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $");
#include <linux/delay.h>
@@ -2035,6 +2035,7 @@ 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);
@@ -2046,6 +2047,7 @@ 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.2 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.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c Sun Dec 19 11:26:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn20_resource.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn20_resource.c,v 1.3 2021/12/19 11:26:14 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.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.3 2021/12/19 11:26:14 riastradh Exp $");
#include <linux/slab.h>
@@ -473,6 +473,8 @@ 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)\
@@ -501,6 +503,8 @@ 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)\
@@ -1211,12 +1215,14 @@ 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,
@@ -1268,14 +1274,18 @@ 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,
};
@@ -1389,8 +1399,10 @@ 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++) {
