CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core
Module Name:src Committed By: mrg Date: Tue Aug 15 05:01:58 UTC 2023 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core: amdgpu_dc_stream.c Log Message: avoid a GCC 12 warning. there's a 1-element long array and a loop conditional that tries to see if indexes for it are not identical. as these indexes will always both be 0, the only valid index, the condition is always false. GCC 12 triggers a strange warning on this code that can never run (see below), so simply assert the array size is 1 and comment the rest. amdgpu_dc_stream.c:470:55: error: array subscript [0, 0] is outside array bounds of 'struct dc_writeback_info[1]' [-Werror=array-bounds] 470 | stream->writeback_info[j] = stream->writeback_info[i]; To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core
Module Name:src
Committed By: mrg
Date: Tue Aug 15 05:01:58 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core:
amdgpu_dc_stream.c
Log Message:
avoid a GCC 12 warning.
there's a 1-element long array and a loop conditional that tries to see
if indexes for it are not identical. as these indexes will always both
be 0, the only valid index, the condition is always false. GCC 12
triggers a strange warning on this code that can never run (see below),
so simply assert the array size is 1 and comment the rest.
amdgpu_dc_stream.c:470:55: error: array subscript [0, 0] is outside array
bounds of 'struct dc_writeback_info[1]' [-Werror=array-bounds]
470 | stream->writeback_info[j] =
stream->writeback_info[i];
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.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_stream.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.c:1.2 Sat Dec 18 23:45:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.c Tue Aug 15 05:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dc_stream.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_stream.c,v 1.3 2023/08/15 05:01:57 mrg Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_stream.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_stream.c,v 1.3 2023/08/15 05:01:57 mrg Exp $");
#include
#include
@@ -465,9 +465,18 @@ bool dc_stream_remove_writeback(struct d
/* remove writeback info for disabled writeback pipes from stream */
for (i = 0, j = 0; i < stream->num_wb_info; i++) {
if (stream->writeback_info[i].wb_enabled) {
+#ifdef __NetBSD__
+ /*
+ * XXXGCC12
+ * The array is only 1 entry long, so i and j must
+ * always be 0 here, so the below test fails.
+ */
+ CTASSERT(ARRAY_SIZE(stream->writeback_info) == 1);
+#else
if (i != j)
/* trim the array */
stream->writeback_info[j] = stream->writeback_info[i];
+#endif
j++;
}
}
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src
Committed By: riastradh
Date: Thu Jul 20 21:48:49 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs:
amdgpu_dcn_calcs.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20:
amdgpu_dcn20_resource.c
Log Message:
amdgpu: Mark float-dependent variables volatile.
This way they are computed -- using FP instructions -- before
DC_FP_END, after which point FP instructions will trap or behave
unpredictably.
This is a workaround, not a proper solution -- really, the
DC_FP_START/END calls should happen in a separate compilation unit
built without -mhard-float or whatever, but that's a lot more work to
make happen for now.
PR kern/57059
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c
cvs rdiff -u -r1.4 -r1.5 \
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/amd/display/dc/calcs/amdgpu_dcn_calcs.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c:1.3 Sun Dec 19 11:35:07 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c Thu Jul 20 21:48:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn_calcs.c,v 1.3 2021/12/19 11:35:07 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn_calcs.c,v 1.4 2023/07/20 21:48:49 riastradh Exp $ */
/*
* Copyright 2017 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn_calcs.c,v 1.3 2021/12/19 11:35:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn_calcs.c,v 1.4 2023/07/20 21:48:49 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -626,7 +626,7 @@ static void calc_wm_sets_and_perf_params
static bool dcn_bw_apply_registry_override(struct dc *dc)
{
- bool updated = false;
+ volatile bool updated = false;
DC_FP_START();
if ((int)(dc->dcn_soc->sr_exit_time * 1000) != dc->debug.sr_exit_time_ns
@@ -733,7 +733,7 @@ bool dcn_validate_bandwidth(
struct dcn_bw_internal_vars *v = &context->dcn_bw_vars;
int i, input_idx, k;
int vesa_sync_start, asic_blank_end, asic_blank_start;
- bool bw_limit_pass;
+ volatile bool bw_limit_pass;
float bw_limit;
PERFORMANCE_TRACE_START();
@@ -1502,7 +1502,7 @@ void dcn_bw_notify_pplib_of_wm_ranges(st
{
struct pp_smu_funcs_rv *pp = NULL;
struct pp_smu_wm_range_sets ranges = {0};
- int min_fclk_khz, min_dcfclk_khz, socclk_khz;
+ volatile int min_fclk_khz, min_dcfclk_khz, socclk_khz;
const int overdrive = 500; /* 5 GHz to cover Overdrive */
if (dc->res_pool->pp_smu)
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.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.4 Sun Dec 19 11:59:31 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c Thu Jul 20 21:48:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn20_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn20_resource.c,v 1.5 2023/07/20 21:48:49 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.5 2023/07/20 21:48:49 riastradh Exp $");
#include
@@ -2932,7 +2932,7 @@ validate_out:
bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool fast_validate)
{
- bool voltage_supported = false;
+ volatile bool voltage_supported = false;
bool full_pstate_supported = false;
bool dummy_pstate_supported = false;
double p_state_latency_us;
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Thu Jul 20 21:48:49 UTC 2023 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs: amdgpu_dcn_calcs.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20: amdgpu_dcn20_resource.c Log Message: amdgpu: Mark float-dependent variables volatile. This way they are computed -- using FP instructions -- before DC_FP_END, after which point FP instructions will trap or behave unpredictably. This is a workaround, not a proper solution -- really, the DC_FP_START/END calls should happen in a separate compilation unit built without -mhard-float or whatever, but that's a lot more work to make happen for now. PR kern/57059 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c cvs rdiff -u -r1.4 -r1.5 \ 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.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:05:08 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc: os_types.h Log Message: amdgpu: Define DC_FPU_START/END on Arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h 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/os_types.h diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h:1.4 --- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h:1.3 Sun Dec 19 11:35:07 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h Sun Jul 24 20:05:08 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: os_types.h,v 1.3 2021/12/19 11:35:07 riastradh Exp $ */ +/* $NetBSD: os_types.h,v 1.4 2022/07/24 20:05:08 riastradh Exp $ */ /* * Copyright 2012-16 Advanced Micro Devices, Inc. @@ -53,16 +53,21 @@ #define dm_error(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) #if defined(CONFIG_DRM_AMD_DC_DCN) -#if defined(CONFIG_X86) #ifdef __NetBSD__ +#if defined(__i386__) || defined(__x86_64__) #include #define DC_FP_START() fpu_kern_enter() #define DC_FP_END() fpu_kern_leave() -#else +#elif defined(__arm__) || defined(__aarch64__) +#include +#define DC_FP_START() fpu_kern_enter() +#define DC_FP_END() fpu_kern_leave() +#endif +#else /* !__NetBSD__ */ +#if defined(CONFIG_X86) #include #define DC_FP_START() kernel_fpu_begin() #define DC_FP_END() kernel_fpu_end() -#endif #elif defined(CONFIG_PPC64) #include #include @@ -92,6 +97,7 @@ } #endif #endif +#endif /* *
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Jul 24 20:05:08 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc: os_types.h Log Message: amdgpu: Define DC_FPU_START/END on Arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/os_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
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
-__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
#include
@@ -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
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
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.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:59:19 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: core_types.h Log Message: amdgpu: Include hw/audio.h; avoid config(5)-caused audio.h collision. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h 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/inc/core_types.h diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h:1.3 --- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h:1.2 Sat Dec 18 23:45:05 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h Sun Dec 19 11:59:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: core_types.h,v 1.2 2021/12/18 23:45:05 riastradh Exp $ */ +/* $NetBSD: core_types.h,v 1.3 2021/12/19 11:59:19 riastradh Exp $ */ /* * Copyright 2015 Advanced Micro Devices, Inc. @@ -50,7 +50,7 @@ void enable_surface_flip_reporting(struc #include "link_encoder.h" #include "stream_encoder.h" #include "clock_source.h" -#include "audio.h" +#include "hw/audio.h" #include "dm_pp_smu.h" #ifdef CONFIG_DRM_AMD_DC_HDCP #include "dm_cp_psp.h"
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:59:19 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: core_types.h Log Message: amdgpu: Include hw/audio.h; avoid config(5)-caused audio.h collision. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/core_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:25:01 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10:
amdgpu_dcn10_link_encoder.c amdgpu_dcn10_stream_encoder.c
Log Message:
amdgpu: Mark unused variables as such.
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_link_encoder.c
\
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.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_link_encoder.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_link_encoder.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_link_encoder.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_link_encoder.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_link_encoder.c Sun Dec 19 11:25:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_link_encoder.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_link_encoder.c,v 1.3 2021/12/19 11:25:01 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_link_encoder.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_link_encoder.c,v 1.3 2021/12/19 11:25:01 riastradh Exp $");
#include
#include
@@ -1200,7 +1200,7 @@ void dcn10_link_encoder_update_mst_strea
const struct link_mst_stream_allocation_table *table)
{
struct dcn10_link_encoder *enc10 = TO_DCN10_LINK_ENC(enc);
- uint32_t value0 = 0;
+ uint32_t value0 __unused = 0;
uint32_t value1 = 0;
uint32_t value2 = 0;
uint32_t slots = 0;
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.c Sun Dec 19 11:25:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_stream_encoder.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_stream_encoder.c,v 1.3 2021/12/19 11:25:01 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_stream_encoder.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_stream_encoder.c,v 1.3 2021/12/19 11:25:01 riastradh Exp $");
#include
@@ -63,7 +63,7 @@ void enc1_update_generic_info_packet(
uint32_t packet_index,
const struct dc_info_packet *info_packet)
{
- uint32_t regval;
+ uint32_t regval __unused;
/* TODOFPGA Figure out a proper number for max_retries polling for lock
* use 50 for now.
*/
@@ -263,8 +263,8 @@ void enc1_stream_encoder_dp_set_stream_a
uint32_t h_back_porch;
uint8_t synchronous_clock = 0; /* asynchronous mode */
uint8_t colorimetry_bpc;
- uint8_t dynamic_range_rgb = 0; /*full range*/
- uint8_t dynamic_range_ycbcr = 1; /*bt709*/
+ uint8_t dynamic_range_rgb __unused = 0; /*full range*/
+ uint8_t dynamic_range_ycbcr __unused = 1; /*bt709*/
uint8_t dp_pixel_encoding = 0;
uint8_t dp_component_depth = 0;
@@ -1279,7 +1279,7 @@ static void enc1_se_audio_setup(
{
struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
- uint32_t speakers = 0;
+ uint32_t speakers __unused = 0;
uint32_t channels = 0;
ASSERT(audio_info);
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:25:01 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10: amdgpu_dcn10_link_encoder.c amdgpu_dcn10_stream_encoder.c Log Message: amdgpu: Mark unused variables as such. 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_link_encoder.c \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_stream_encoder.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:24:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc: dm_services.h
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10:
amdgpu_dcn10_hw_sequencer_debug.c
Log Message:
amdgpu: Fix prototype for snprintf_count: const, __printflike.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_services.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer_debug.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/dm_services.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_services.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_services.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_services.h:1.2 Sat Dec 18 23:45:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_services.h Sun Dec 19 11:24:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_services.h,v 1.2 2021/12/18 23:45:00 riastradh Exp $ */
+/* $NetBSD: dm_services.h,v 1.3 2021/12/19 11:24:52 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -163,7 +163,7 @@ void generic_reg_wait(const struct dc_co
unsigned int delay_between_poll_us, unsigned int time_out_num_tries,
const char *func_name, int line);
-unsigned int snprintf_count(char *pBuf, unsigned int bufSize, char *fmt, ...);
+unsigned int __printflike(3,4) snprintf_count(char *pBuf, unsigned int bufSize, const char *fmt, ...);
/* These macros need to be used with soc15 registers in order to retrieve
* the actual offset.
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer_debug.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer_debug.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer_debug.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer_debug.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_debug.c Sun Dec 19 11:24:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_hw_sequencer_debug.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_hw_sequencer_debug.c,v 1.3 2021/12/19 11:24:52 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_hw_sequencer_debug.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_hw_sequencer_debug.c,v 1.3 2021/12/19 11:24:52 riastradh Exp $");
#include "dm_services.h"
#include "core_types.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10
#include "dcn10_cm_common.h"
#include "clk_mgr.h"
-unsigned int snprintf_count(char *pBuf, unsigned int bufSize, char *fmt, ...)
+unsigned int __printflike(3,4) snprintf_count(char *pBuf, unsigned int bufSize, const char *fmt, ...)
{
unsigned int ret_vsnprintf;
unsigned int chars_printed;
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:24:52 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc: dm_services.h src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10: amdgpu_dcn10_hw_sequencer_debug.c Log Message: amdgpu: Fix prototype for snprintf_count: const, __printflike. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_services.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_hw_sequencer_debug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10
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
-__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
#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) {
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10
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.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:24:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10:
amdgpu_dcn10_dpp.c
Log Message:
amdgpu: Mark unused variable as such.
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_dpp.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_dpp.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_dpp.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_dpp.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_dpp.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10/amdgpu_dcn10_dpp.c Sun Dec 19 11:24:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn10_dpp.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn10_dpp.c,v 1.3 2021/12/19 11:24:00 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_dpp.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn10_dpp.c,v 1.3 2021/12/19 11:24:00 riastradh Exp $");
#include "dm_services.h"
@@ -139,7 +139,7 @@ bool dpp1_get_optimal_number_of_taps(
struct scaler_data *scl_data,
const struct scaling_taps *in_taps)
{
- uint32_t pixel_width;
+ uint32_t pixel_width __unused;
if (scl_data->viewport.width > scl_data->recout.width)
pixel_width = scl_data->recout.width;
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:24:00 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn10: amdgpu_dcn10_dpp.c Log Message: amdgpu: Mark unused variable as such. 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_dpp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:23:38 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs: amdgpu_dce_calcs.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: dce_calcs.h Log Message: amdgpu: Remove bogus const qualifier in bw_calcs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h 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/calcs/amdgpu_dce_calcs.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c:1.3 Sun Dec 19 11:23:26 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c Sun Dec 19 11:23:37 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: amdgpu_dce_calcs.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $ */ +/* $NetBSD: amdgpu_dce_calcs.c,v 1.4 2021/12/19 11:23:37 riastradh Exp $ */ /* * Copyright 2015 Advanced Micro Devices, Inc. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_calcs.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_calcs.c,v 1.4 2021/12/19 11:23:37 riastradh Exp $"); #include @@ -3018,7 +3018,7 @@ static bool all_displays_in_sync(const s bool bw_calcs(struct dc_context *ctx, const struct bw_calcs_dceip *dceip, - const struct bw_calcs_vbios *vbios, + struct bw_calcs_vbios *vbios, const struct pipe_ctx pipe[], int pipe_count, struct dce_bw_output *calcs_output) Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h:1.3 --- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h:1.2 Sat Dec 18 23:45:05 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h Sun Dec 19 11:23:38 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dce_calcs.h,v 1.2 2021/12/18 23:45:05 riastradh Exp $ */ +/* $NetBSD: dce_calcs.h,v 1.3 2021/12/19 11:23:38 riastradh Exp $ */ /* * Copyright 2015-2017 Advanced Micro Devices, Inc. @@ -482,7 +482,7 @@ void bw_calcs_init( bool bw_calcs( struct dc_context *ctx, const struct bw_calcs_dceip *dceip, - const struct bw_calcs_vbios *vbios, + struct bw_calcs_vbios *vbios, const struct pipe_ctx *pipe, int pipe_count, struct dce_bw_output *calcs_output);
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:23:38 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs: amdgpu_dce_calcs.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: dce_calcs.h Log Message: amdgpu: Remove bogus const qualifier in bw_calcs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/dce_calcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:23:26 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc: dm_event_log.h
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs:
amdgpu_dce_calcs.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce: amdgpu_dce_abm.c
amdgpu_dce_clock_source.c amdgpu_dce_link_encoder.c
amdgpu_dce_stream_encoder.c
Log Message:
amdgpu: Mark unused variables as such.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_event_log.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c
\
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_stream_encoder.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.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/dm_event_log.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_event_log.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_event_log.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_event_log.h:1.2 Sat Dec 18 23:45:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_event_log.h Sun Dec 19 11:23:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_event_log.h,v 1.2 2021/12/18 23:45:00 riastradh Exp $ */
+/* $NetBSD: dm_event_log.h,v 1.3 2021/12/19 11:23:26 riastradh Exp $ */
/*
* Copyright 2018 Advanced Micro Devices, Inc.
@@ -33,9 +33,18 @@
#define __DM_EVENT_LOG_H__
-#define EVENT_LOG_AUX_REQ(ddc, type, action, address, len, data)
-#define EVENT_LOG_AUX_REP(ddc, type, replyStatus, len, data)
-#define EVENT_LOG_CUST_MSG(tag, a, ...)
+enum event_log_type {
+ EVENT_LOG_AUX_ORIGIN_NATIVE,
+};
+
+#define EVENT_LOG_AUX_REQ(ddc, type, action, address, len, data) \
+ (void)((void)(ddc), (void)(type), (void)(action), (void)(address),\
+ (void)(len), (void)(data))
+#define EVENT_LOG_AUX_REP(ddc, type, replyStatus, len, data) \
+ (void)((void)(ddc), (void)(type), (void)(replyStatus), (void)(len), \
+ (void)(data))
+#define EVENT_LOG_CUST_MSG(tag, a, ...) \
+ (void)((void)(tag), (void)(a))
#endif
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c:1.2 Sat Dec 18 23:45:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c Sun Dec 19 11:23:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce_calcs.c,v 1.2 2021/12/18 23:45:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce_calcs.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_calcs.c,v 1.2 2021/12/18 23:45:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_calcs.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $");
#include
@@ -111,7 +111,7 @@ static void calculate_bandwidth(
bool lpt_enabled;
enum bw_defines sclk_message;
enum bw_defines yclk_message;
- enum bw_defines v_filter_init_mode[maximum_number_of_surfaces];
+ enum bw_defines v_filter_init_mode[maximum_number_of_surfaces] __unused;
enum bw_defines tiling_mode[maximum_number_of_surfaces];
enum bw_defines surface_type[maximum_number_of_surfaces];
enum bw_defines voltage;
@@ -3036,7 +3036,7 @@ bool bw_calcs(struct dc_context *ctx,
calcs_output->all_displays_in_sync = false;
if (data->number_of_displays != 0) {
- uint8_t yclk_lvl, sclk_lvl;
+ uint8_t yclk_lvl, sclk_lvl __unused;
struct bw_fixed high_sclk = vbios->high_sclk;
struct bw_fixed mid1_sclk = vbios->mid1_sclk;
struct bw_fixed mid2_sclk = vbios->mid2_sclk;
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c:1.2 Sat Dec 18 23:45:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c Sun Dec 19 11:23:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce_abm.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce_abm.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $ */
/*
* Copyright 2012-16 Advanced Micro Devices, Inc
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:23:26 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc: dm_event_log.h src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs: amdgpu_dce_calcs.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce: amdgpu_dce_abm.c amdgpu_dce_clock_source.c amdgpu_dce_link_encoder.c amdgpu_dce_stream_encoder.c Log Message: amdgpu: Mark unused variables as such. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dm_event_log.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dce_calcs.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_abm.c \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_stream_encoder.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:23:17 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce:
amdgpu_dce_clock_source.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: clock_source.h
Log Message:
amdgpu: Omit troublesome const in clock_source_funcs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h
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/dce/amdgpu_dce_clock_source.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c:1.2 Sat Dec 18 23:45:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c Sun Dec 19 11:23:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce_clock_source.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce_clock_source.c,v 1.3 2021/12/19 11:23:16 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_clock_source.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_clock_source.c,v 1.3 2021/12/19 11:23:16 riastradh Exp $");
#include
@@ -988,7 +988,7 @@ static bool dce110_clock_source_power_do
}
static bool get_pixel_clk_frequency_100hz(
- const struct clock_source *clock_source,
+ struct clock_source *clock_source,
unsigned int inst,
unsigned int *pixel_clk_khz)
{
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h:1.2 Sat Dec 18 23:45:05 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h Sun Dec 19 11:23:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_source.h,v 1.2 2021/12/18 23:45:05 riastradh Exp $ */
+/* $NetBSD: clock_source.h,v 1.3 2021/12/19 11:23:17 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -169,7 +169,7 @@ struct clock_source_funcs {
struct pixel_clk_params *,
struct pll_settings *);
bool (*get_pixel_clk_frequency_100hz)(
- const struct clock_source *clock_source,
+ struct clock_source *clock_source,
unsigned int inst,
unsigned int *pixel_clk_khz);
};
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:23:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce: amdgpu_dce_clock_source.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc: clock_source.h Log Message: amdgpu: Omit troublesome const in clock_source_funcs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/inc/clock_source.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:23:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120:
amdgpu_dce120_hw_sequencer.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80:
amdgpu_dce80_hw_sequencer.c
Log Message:
amdgpu: Mark some unused variables as such.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_hw_sequencer.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_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/dce120/amdgpu_dce120_hw_sequencer.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_hw_sequencer.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_hw_sequencer.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_hw_sequencer.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_hw_sequencer.c Sun Dec 19 11:23:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce120_hw_sequencer.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce120_hw_sequencer.c,v 1.3 2021/12/19 11:23:00 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce120_hw_sequencer.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce120_hw_sequencer.c,v 1.3 2021/12/19 11:23:00 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -55,7 +55,7 @@ struct dce120_hw_seq_reg_offsets {
uint32_t crtc;
};
-static const struct dce120_hw_seq_reg_offsets reg_offsets[] = {
+static const struct dce120_hw_seq_reg_offsets reg_offsets[] __unused = {
{
.crtc = (mmCRTC0_CRTC_GSL_CONTROL - mmCRTC0_CRTC_GSL_CONTROL),
},
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_hw_sequencer.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_hw_sequencer.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_hw_sequencer.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_hw_sequencer.c:1.2 Sat Dec 18 23:45:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_hw_sequencer.c Sun Dec 19 11:23:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce80_hw_sequencer.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce80_hw_sequencer.c,v 1.3 2021/12/19 11:23:00 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce80_hw_sequencer.c,v 1.2 2021/12/18 23:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce80_hw_sequencer.c,v 1.3 2021/12/19 11:23:00 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -45,7 +45,7 @@ struct dce80_hw_seq_reg_offsets {
uint32_t crtc;
};
-static const struct dce80_hw_seq_reg_offsets reg_offsets[] = {
+static const struct dce80_hw_seq_reg_offsets reg_offsets[] __unused = {
{
.crtc = (mmCRTC0_CRTC_GSL_CONTROL - mmCRTC_GSL_CONTROL),
},
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:23:00 UTC 2021 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120: amdgpu_dce120_hw_sequencer.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80: amdgpu_dce80_hw_sequencer.c Log Message: amdgpu: Mark some unused variables as such. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce120/amdgpu_dce120_hw_sequencer.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce80/amdgpu_dce80_hw_sequencer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:22:40 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core:
amdgpu_dc_link_dp.c
Log Message:
amdgpu: Fix bogus enum.
Cherry-picked from:
commit a110f3750bf8b93764f13bd1402c7cba03d15d61
Author: Arnd Bergmann
Date: Mon Oct 26 22:00:30 2020 +0100
drm/amdgpu: fix incorrect enum type
core_link_write_dpcd() returns enum dc_status, not ddc_result:
display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode':
display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enu
m dc_status' to 'enum ddc_result'
[-Wenum-conversion]
Avoid the warning by using the correct enum in the caller.
Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link
Training")
Signed-off-by: Arnd Bergmann
Signed-off-by: Alex Deucher
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.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_link_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c:1.4 Sun Dec 19 10:59:36 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c Sun Dec 19 11:22:40 2021
@@ -1,8 +1,8 @@
-/* $NetBSD: amdgpu_dc_link_dp.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_link_dp.c,v 1.5 2021/12/19 11:22:40 riastradh Exp $ */
/* Copyright 2015 Advanced Micro Devices, Inc. */
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_link_dp.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_link_dp.c,v 1.5 2021/12/19 11:22:40 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -4010,7 +4010,7 @@ void dp_set_panel_mode(struct dc_link *l
if (edp_config_set.bits.PANEL_MODE_EDP
!= panel_mode_edp) {
- enum ddc_result result = DDC_RESULT_UNKNOWN;
+ enum dc_status result = DC_ERROR_UNEXPECTED;
edp_config_set.bits.PANEL_MODE_EDP =
panel_mode_edp;
@@ -4020,7 +4020,7 @@ void dp_set_panel_mode(struct dc_link *l
&edp_config_set.raw,
sizeof(edp_config_set.raw));
- ASSERT(result == DDC_RESULT_SUCESSFULL);
+ ASSERT(result == DC_OK);
}
}
DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d "
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:22:40 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core:
amdgpu_dc_link_dp.c
Log Message:
amdgpu: Fix bogus enum.
Cherry-picked from:
commit a110f3750bf8b93764f13bd1402c7cba03d15d61
Author: Arnd Bergmann
Date: Mon Oct 26 22:00:30 2020 +0100
drm/amdgpu: fix incorrect enum type
core_link_write_dpcd() returns enum dc_status, not ddc_result:
display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode':
display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enu
m dc_status' to 'enum ddc_result'
[-Wenum-conversion]
Avoid the warning by using the correct enum in the caller.
Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link
Training")
Signed-off-by: Arnd Bergmann
Signed-off-by: Alex Deucher
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
