Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:59:37 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios:
amdgpu_bios_parser.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core:
amdgpu_dc_hw_sequencer.c amdgpu_dc_link_dp.c amdgpu_dc_resource.c
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_mem_input_v.c
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr:
amdgpu_ci_smumgr.c
Log Message:
Give up and use -Wno-missing-prototypes, ugh.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios/amdgpu_bios_parser.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_hw_sequencer.c
\
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c \
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/dce100/amdgpu_dce100_resource.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c
\
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_mem_input_v.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr/amdgpu_ci_smumgr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.14 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.15
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.14 Sun Dec 19 10:59:00 2021
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Dec 19 10:59:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.amdgpu,v 1.14 2021/12/19 10:59:00 riastradh Exp $
+# $NetBSD: files.amdgpu,v 1.15 2021/12/19 10:59:36 riastradh Exp $
version 20180827
@@ -34,6 +34,7 @@ makeoptions amdgpu "CPPFLAGS.amdgpu"+="-
makeoptions amdgpu "CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_ACP"
makeoptions amdgpu "CWARNFLAGS.amdgpu"+="-Wno-missing-field-initializers"
+makeoptions amdgpu "CWARNFLAGS.amdgpu"+="-Wno-missing-prototypes"
makeoptions amdgpu "CWARNFLAGS.amdgpu"+="-Wno-shadow"
makeoptions amdgpu "CWARNFLAGS.amdgpu"+="-Wno-pointer-arith"
makeoptions amdgpu "CWARNFLAGS.amdgpu"+="-Wno-override-init"
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios/amdgpu_bios_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios/amdgpu_bios_parser.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios/amdgpu_bios_parser.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios/amdgpu_bios_parser.c:1.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/bios/amdgpu_bios_parser.c Sun Dec 19 10:59:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_bios_parser.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_bios_parser.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $ */
/*
* Copyright 2012-15 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_bios_parser.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_bios_parser.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $");
#include <linux/slab.h>
@@ -2589,7 +2589,6 @@ static struct integrated_info *bios_pars
return NULL;
}
-static
enum bp_result update_slot_layout_info(
struct dc_bios *dcb,
unsigned int i,
@@ -2694,7 +2693,6 @@ enum bp_result update_slot_layout_info(
}
-static
enum bp_result get_bracket_layout_record(
struct dc_bios *dcb,
unsigned int bracket_layout_id,
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_hw_sequencer.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_hw_sequencer.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_hw_sequencer.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_hw_sequencer.c:1.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_hw_sequencer.c Sun Dec 19 10:59:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dc_hw_sequencer.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_hw_sequencer.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $ */
/*
* Copyright 2015 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_hw_sequencer.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_hw_sequencer.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $");
#include <linux/delay.h>
@@ -182,7 +182,6 @@ static bool is_ycbcr709_limited_type(
ret = true;
return ret;
}
-static
enum dc_color_space_type get_color_space_type(enum dc_color_space color_space)
{
enum dc_color_space_type type = COLOR_SPACE_RGB_TYPE;
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.3 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.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_link_dp.c Sun Dec 19 10:59:36 2021
@@ -1,8 +1,8 @@
-/* $NetBSD: amdgpu_dc_link_dp.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_link_dp.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $ */
/* Copyright 2015 Advanced Micro Devices, Inc. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_link_dp.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_link_dp.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -3523,7 +3523,6 @@ bool detect_dp_sink_caps(struct dc_link
/* TODO save sink caps in link->sink */
}
-static
enum dc_link_rate linkRateInKHzToLinkRateMultiplier(uint32_t link_rate_in_khz)
{
enum dc_link_rate link_rate;
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.3 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.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_resource.c Sun Dec 19 10:59:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dc_resource.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dc_resource.c,v 1.4 2021/12/19 10:59:36 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.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dc_resource.c,v 1.4 2021/12/19 10:59:36 riastradh Exp $");
#include <linux/slab.h>
@@ -972,7 +972,6 @@ static void calculate_inits_and_adj_vp(s
* We also need to make sure pipe_ctx->plane_res.scl_data.h_active uses the
* original h_border_left value in its calculation.
*/
-static
int shift_border_left_to_dst(struct pipe_ctx *pipe_ctx)
{
int store_h_border_left = pipe_ctx->stream->timing.h_border_left;
@@ -984,7 +983,6 @@ int shift_border_left_to_dst(struct pipe
return store_h_border_left;
}
-static
void restore_border_left_from_dst(struct pipe_ctx *pipe_ctx,
int store_h_border_left)
{
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.3 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.3 Sun Dec 19 10:59:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce100/amdgpu_dce100_resource.c Sun Dec 19 10:59:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce100_resource.c,v 1.3 2021/12/19 10:59:01 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce100_resource.c,v 1.4 2021/12/19 10:59:37 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.3 2021/12/19 10:59:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce100_resource.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $");
#include <linux/slab.h>
@@ -616,7 +616,6 @@ static const struct encoder_feature_supp
.flags.bits.IS_TPS3_CAPABLE = true
};
-static
struct link_encoder *dce100_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
@@ -639,7 +638,6 @@ struct link_encoder *dce100_link_encoder
return &enc110->base;
}
-static
struct output_pixel_processor *dce100_opp_create(
struct dc_context *ctx,
uint32_t inst)
@@ -655,7 +653,6 @@ struct output_pixel_processor *dce100_op
return &opp->base;
}
-static
struct dce_aux *dce100_aux_engine_create(
struct dc_context *ctx,
uint32_t inst)
@@ -694,7 +691,6 @@ static const struct dce_i2c_mask i2c_mas
I2C_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(_MASK)
};
-static
struct dce_i2c_hw *dce100_i2c_hw_create(
struct dc_context *ctx,
uint32_t inst)
@@ -710,7 +706,6 @@ struct dce_i2c_hw *dce100_i2c_hw_create(
return dce_i2c_hw;
}
-static
struct clock_source *dce100_clock_source_create(
struct dc_context *ctx,
struct dc_bios *bios,
@@ -735,7 +730,6 @@ struct clock_source *dce100_clock_source
return NULL;
}
-static
void dce100_clock_source_destroy(struct clock_source **clk_src)
{
kfree(TO_DCE110_CLK_SRC(*clk_src));
@@ -827,7 +821,6 @@ static enum dc_status build_mapped_resou
return DC_OK;
}
-static
bool dce100_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
@@ -873,7 +866,6 @@ static bool dce100_validate_surface_sets
return true;
}
-static
enum dc_status dce100_validate_global(
struct dc *dc,
struct dc_state *context)
@@ -884,7 +876,6 @@ enum dc_status dce100_validate_global(
return DC_OK;
}
-static
enum dc_status dce100_add_stream_to_ctx(
struct dc *dc,
struct dc_state *new_ctx,
@@ -912,7 +903,6 @@ static void dce100_destroy_resource_pool
*pool = NULL;
}
-static
enum dc_status dce100_validate_plane(const struct dc_plane_state *plane_state, struct dc_caps *caps)
{
@@ -922,7 +912,6 @@ enum dc_status dce100_validate_plane(con
return DC_FAIL_SURFACE_VALIDATE;
}
-static
struct stream_encoder *dce100_find_first_free_match_stream_enc_for_link(
struct resource_context *res_ctx,
const struct resource_pool *pool,
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.3 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.3 Sun Dec 19 10:59:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_hw_sequencer.c Sun Dec 19 10:59:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.3 2021/12/19 10:59:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.4 2021/12/19 10:59:37 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.3 2021/12/19 10:59:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_hw_sequencer.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $");
#include <linux/delay.h>
@@ -2691,7 +2691,6 @@ static void program_output_csc(struct dc
}
}
-static
void dce110_set_cursor_position(struct pipe_ctx *pipe_ctx)
{
struct dc_cursor_position pos_cpy = pipe_ctx->stream->cursor_position;
@@ -2720,7 +2719,6 @@ void dce110_set_cursor_position(struct p
mi->funcs->set_cursor_position(mi, &pos_cpy, ¶m);
}
-static
void dce110_set_cursor_attribute(struct pipe_ctx *pipe_ctx)
{
struct dc_cursor_attributes *attributes = &pipe_ctx->stream->cursor_attributes;
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_mem_input_v.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_mem_input_v.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_mem_input_v.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_mem_input_v.c:1.3 Sun Dec 19 10:59:02 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dce110/amdgpu_dce110_mem_input_v.c Sun Dec 19 10:59:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dce110_mem_input_v.c,v 1.3 2021/12/19 10:59:02 riastradh Exp $ */
+/* $NetBSD: amdgpu_dce110_mem_input_v.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $ */
/*
* Copyright 2012-16 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_mem_input_v.c,v 1.3 2021/12/19 10:59:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dce110_mem_input_v.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $");
#include "dm_services.h"
@@ -474,7 +474,6 @@ static void program_pixel_format(
}
}
-static
bool dce_mem_input_v_is_surface_pending(struct mem_input *mem_input)
{
struct dce_mem_input *mem_input110 = TO_DCE_MEM_INPUT(mem_input);
@@ -490,7 +489,6 @@ bool dce_mem_input_v_is_surface_pending(
return false;
}
-static
bool dce_mem_input_v_program_surface_flip_and_addr(
struct mem_input *mem_input,
const struct dc_plane_address *address,
@@ -568,7 +566,6 @@ static const unsigned int *get_dvmm_hw_s
}
}
-static
void dce_mem_input_v_program_pte_vm(
struct mem_input *mem_input,
enum surface_pixel_format format,
@@ -642,7 +639,6 @@ void dce_mem_input_v_program_pte_vm(
dm_write_reg(mem_input110->base.ctx, mmUNP_DVMM_PTE_ARB_CONTROL_C, value);
}
-static
void dce_mem_input_v_program_surface_config(
struct mem_input *mem_input,
enum surface_pixel_format format,
@@ -929,7 +925,6 @@ static void program_nbp_watermark_c(
marks);
}
-static
void dce_mem_input_v_program_display_marks(
struct mem_input *mem_input,
struct dce_watermarks nbp,
@@ -953,7 +948,6 @@ void dce_mem_input_v_program_display_mar
}
-static
void dce_mem_input_program_chroma_display_marks(
struct mem_input *mem_input,
struct dce_watermarks nbp,
@@ -975,7 +969,6 @@ void dce_mem_input_program_chroma_displa
stutter);
}
-static
void dce110_allocate_mem_input_v(
struct mem_input *mi,
uint32_t h_total,/* for current stream */
@@ -1018,7 +1011,6 @@ void dce110_allocate_mem_input_v(
}
-static
void dce110_free_mem_input_v(
struct mem_input *mi,
uint32_t total_stream_num)
Index: src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr/amdgpu_ci_smumgr.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr/amdgpu_ci_smumgr.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr/amdgpu_ci_smumgr.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr/amdgpu_ci_smumgr.c:1.3 Sun Dec 19 10:59:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/smumgr/amdgpu_ci_smumgr.c Sun Dec 19 10:59:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_ci_smumgr.c,v 1.3 2021/12/19 10:59:03 riastradh Exp $ */
+/* $NetBSD: amdgpu_ci_smumgr.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $ */
/*
* Copyright 2017 Advanced Micro Devices, Inc.
@@ -23,7 +23,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_smumgr.c,v 1.3 2021/12/19 10:59:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_ci_smumgr.c,v 1.4 2021/12/19 10:59:37 riastradh Exp $");
#include <linux/module.h>
#include <linux/slab.h>
@@ -188,7 +188,6 @@ static int ci_program_jump_on_start(stru
return 0;
}
-static
bool ci_is_smc_ram_running(struct pp_hwmgr *hwmgr)
{
return ((0 == PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device,
