Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:262:15:
warning: initialized field overwritten [-Woverride-init]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:266:2: note:
in expansion of macro ‘stream_enc_regs’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:262:15:
note: (near initialization for ‘stream_enc_regs[0].TMDS_CNTL’)
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:266:2: note:
in expansion of macro ‘stream_enc_regs’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:262:15:
warning: initialized field overwritten [-Woverride-init]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:267:2: note:
in expansion of macro ‘stream_enc_regs’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:262:15:
note: (near initialization for ‘stream_enc_regs[1].TMDS_CNTL’)
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:267:2: note:
in expansion of macro ‘stream_enc_regs’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:262:15:
warning: initialized field overwritten [-Woverride-init]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:268:2: note:
in expansion of macro ‘stream_enc_regs’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:262:15:
note: (near initialization for ‘stream_enc_regs[2].TMDS_CNTL’)
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:268:2: note:
in expansion of macro ‘stream_enc_regs’
In file included from
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:66:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:272:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:272:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:272:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:272:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:276:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:276:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:276:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:276:3: note:
in expansion of macro ‘SE_COMMON_MASK_SH_LIST_DCE110’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:553:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:553:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:553:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:553:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:557:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:557:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:557:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:557:3: note:
in expansion of macro ‘HWSEQ_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:594:3: note:
in expansion of macro ‘MI_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:594:3: note:
in expansion of macro ‘MI_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:599:3: note:
in expansion of macro ‘MI_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:599:3: note:
in expansion of macro ‘MI_DCE11_MASK_SH_LIST’
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:718:17:
warning: no previous prototype for ‘dce110_aux_engine_create’
[-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:756:20:
warning: no previous prototype for ‘dce110_i2c_hw_create’ [-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:771:22:
warning: no previous prototype for ‘dce110_clock_source_create’
[-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:795:6:
warning: no previous prototype for ‘dce110_clock_source_destroy’
[-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:1037:16:
warning: no previous prototype for ‘dce110_validate_plane’
[-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:1092:16:
warning: no previous prototype for ‘dce110_validate_global’
[-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.c:1336:29:
warning: no previous prototype for ‘dce110_resource_cap’ [-Wmissing-prototypes]
Cc: Harry Wentland <harry.wentl...@amd.com>
Cc: Leo Li <sunpeng...@amd.com>
Cc: Alex Deucher <alexander.deuc...@amd.com>
Cc: "Christian König" <christian.koe...@amd.com>
Cc: David Airlie <airl...@linux.ie>
Cc: Daniel Vetter <dan...@ffwll.ch>
Cc: Anthony Koo <anthony....@amd.com>
Cc: amd-...@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
.../drm/amd/display/dc/dce110/dce110_resource.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index af208f9bd03be..73a924ed2b71e 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -715,7 +715,7 @@ static struct output_pixel_processor *dce110_opp_create(
return &opp->base;
}
-struct dce_aux *dce110_aux_engine_create(
+static struct dce_aux *dce110_aux_engine_create(
struct dc_context *ctx,
uint32_t inst)
{
@@ -753,7 +753,7 @@ static const struct dce_i2c_mask i2c_masks = {
I2C_COMMON_MASK_SH_LIST_DCE110(_MASK)
};
-struct dce_i2c_hw *dce110_i2c_hw_create(
+static struct dce_i2c_hw *dce110_i2c_hw_create(
struct dc_context *ctx,
uint32_t inst)
{
@@ -768,7 +768,7 @@ struct dce_i2c_hw *dce110_i2c_hw_create(
return dce_i2c_hw;
}
-struct clock_source *dce110_clock_source_create(
+static struct clock_source *dce110_clock_source_create(
struct dc_context *ctx,
struct dc_bios *bios,
enum clock_source_id id,
@@ -792,7 +792,7 @@ struct clock_source *dce110_clock_source_create(
return NULL;
}
-void dce110_clock_source_destroy(struct clock_source **clk_src)
+static void dce110_clock_source_destroy(struct clock_source **clk_src)
{
struct dce110_clk_src *dce110_clk_src;
@@ -1034,8 +1034,8 @@ static bool dce110_validate_bandwidth(
return result;
}
-enum dc_status dce110_validate_plane(const struct dc_plane_state *plane_state,
- struct dc_caps *caps)
+static enum dc_status dce110_validate_plane(const struct dc_plane_state
*plane_state,
+ struct dc_caps *caps)
{
if (((plane_state->dst_rect.width * 2) < plane_state->src_rect.width) ||
((plane_state->dst_rect.height * 2) < plane_state->src_rect.height))
@@ -1089,7 +1089,7 @@ static bool dce110_validate_surface_sets(
return true;
}
-enum dc_status dce110_validate_global(
+static enum dc_status dce110_validate_global(
struct dc *dc,
struct dc_state *context)
{
@@ -1333,7 +1333,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc)
1000);
}
-const struct resource_caps *dce110_resource_cap(
+static const struct resource_caps *dce110_resource_cap(
struct hw_asic_id *asic_id)
{
if (ASIC_REV_IS_STONEY(asic_id->hw_internal_rev))
--
2.25.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
