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 <sys/cdefs.h>
-__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 <linux/slab.h>
@@ -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.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_abm.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_abm.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $");
#include <linux/slab.h>
@@ -92,8 +92,8 @@ static unsigned int calculate_16_bit_bac
{
uint64_t current_backlight;
uint32_t round_result;
- uint32_t pwm_period_cntl, bl_period, bl_int_count;
- uint32_t bl_pwm_cntl, bl_pwm, fractional_duty_cycle_en;
+ uint32_t pwm_period_cntl __unused, bl_period, bl_int_count;
+ uint32_t bl_pwm_cntl __unused, bl_pwm, fractional_duty_cycle_en;
uint32_t bl_period_mask, bl_pwm_mask;
pwm_period_cntl = REG_READ(BL_PWM_PERIOD_CNTL);
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c:1.2 Sat Dec 18 23:45:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_link_encoder.c Sun Dec 19 11:23:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce_link_encoder.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce_link_encoder.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_link_encoder.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_link_encoder.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $");
#include <linux/delay.h>
#include <linux/slab.h>
@@ -1234,7 +1234,7 @@ void dce110_link_encoder_update_mst_stre
const struct link_mst_stream_allocation_table *table)
{
struct dce110_link_encoder *enc110 = TO_DCE110_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/dce/amdgpu_dce_stream_encoder.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_stream_encoder.c:1.2 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_stream_encoder.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_stream_encoder.c:1.2 Sat Dec 18 23:45:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_stream_encoder.c Sun Dec 19 11:23:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce_stream_encoder.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce_stream_encoder.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_stream_encoder.c,v 1.2 2021/12/18 23:45:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_stream_encoder.c,v 1.3 2021/12/19 11:23:26 riastradh Exp $");
#include <linux/delay.h>
@@ -72,7 +72,7 @@ static void dce110_update_generic_info_p
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.
*/
@@ -1341,7 +1341,7 @@ static void dce110_se_audio_setup(
{
struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
- uint32_t speakers = 0;
+ uint32_t speakers __unused = 0;
uint32_t channels = 0;
ASSERT(audio_info);
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.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c:1.3 Sun Dec 19 11:23:16 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce/amdgpu_dce_clock_source.c Sun Dec 19 11:23:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce_clock_source.c,v 1.3 2021/12/19 11:23:16 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce_clock_source.c,v 1.4 2021/12/19 11:23:26 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_clock_source.c,v 1.3 2021/12/19 11:23:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce_clock_source.c,v 1.4 2021/12/19 11:23:26 riastradh Exp $");
#include <linux/slab.h>
@@ -1019,7 +1019,7 @@ struct pixel_rate_range_table_entry {
unsigned short div_factor;
};
-static const struct pixel_rate_range_table_entry video_optimized_pixel_rates[] = {
+static const struct pixel_rate_range_table_entry video_optimized_pixel_rates[] __unused = {
// /1.001 rates
{25170, 25180, 25200, 1000, 1001}, //25.2MHz -> 25.17
{59340, 59350, 59400, 1000, 1001}, //59.4Mhz -> 59.340
