| Message ID | 20201116173005.1825880-12-lee.jones@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Rid W=1 warnings from GPU | expand |
On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones@linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/dce3_1_afmt.c:30:6: warning: no previous prototype for ‘dce3_2_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes] > 30 | void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/dce3_1_afmt.c:48:6: warning: no previous prototype for ‘dce3_2_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes] > 48 | void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/dce3_1_afmt.c:66:6: warning: no previous prototype for ‘dce3_2_afmt_write_sad_regs’ [-Wmissing-prototypes] > 66 | void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/dce3_1_afmt.c:116:6: warning: no previous prototype for ‘dce3_2_audio_set_dto’ [-Wmissing-prototypes] > 116 | void dce3_2_audio_set_dto(struct radeon_device *rdev, > | ^~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/dce3_1_afmt.c:170:6: warning: no previous prototype for ‘dce3_2_hdmi_update_acr’ [-Wmissing-prototypes] > 170 | void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, > | ^~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/dce3_1_afmt.c:202:6: warning: no previous prototype for ‘dce3_2_set_audio_packet’ [-Wmissing-prototypes] > 202 | void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset) > | ^~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/dce3_1_afmt.c:223:6: warning: no previous prototype for ‘dce3_2_set_mute’ [-Wmissing-prototypes] > 223 | void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute) > | ^~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Slava Grigorev <slava.grigorev@amd.com> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_audio.c | 12 ------------ > drivers/gpu/drm/radeon/radeon_audio.h | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c > index 8c63ccb8b6235..f6c783e19c988 100644 > --- a/drivers/gpu/drm/radeon/radeon_audio.c > +++ b/drivers/gpu/drm/radeon/radeon_audio.c > @@ -38,16 +38,10 @@ void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, > u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); > void dce6_endpoint_wreg(struct radeon_device *rdev, > u32 offset, u32 reg, u32 v); > -void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, > - struct cea_sad *sads, int sad_count); > void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder, > struct cea_sad *sads, int sad_count); > void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, > struct cea_sad *sads, int sad_count); > -void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, > - u8 *sadb, int sad_count); > -void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, > - u8 *sadb, int sad_count); > void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, > u8 *sadb, int sad_count); > void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, > @@ -65,8 +59,6 @@ struct r600_audio_pin* dce6_audio_get_pin(struct radeon_device *rdev); > void dce6_afmt_select_pin(struct drm_encoder *encoder); > void r600_hdmi_audio_set_dto(struct radeon_device *rdev, > struct radeon_crtc *crtc, unsigned int clock); > -void dce3_2_audio_set_dto(struct radeon_device *rdev, > - struct radeon_crtc *crtc, unsigned int clock); > void dce4_hdmi_audio_set_dto(struct radeon_device *rdev, > struct radeon_crtc *crtc, unsigned int clock); > void dce4_dp_audio_set_dto(struct radeon_device *rdev, > @@ -81,8 +73,6 @@ void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset, > unsigned char *buffer, size_t size); > void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, > const struct radeon_hdmi_acr *acr); > -void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, > - const struct radeon_hdmi_acr *acr); > void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset, > const struct radeon_hdmi_acr *acr); > void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); > @@ -90,10 +80,8 @@ void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset); > void dce4_hdmi_set_color_depth(struct drm_encoder *encoder, > u32 offset, int bpc); > void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); > -void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); > void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset); > void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); > -void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); > void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); > static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, > struct drm_display_mode *mode); > diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h > index 5c70cceaa4a6c..05e67867469b0 100644 > --- a/drivers/gpu/drm/radeon/radeon_audio.h > +++ b/drivers/gpu/drm/radeon/radeon_audio.h > @@ -81,4 +81,16 @@ void radeon_audio_mode_set(struct drm_encoder *encoder, > void radeon_audio_dpms(struct drm_encoder *encoder, int mode); > unsigned int radeon_audio_decode_dfs_div(unsigned int div); > > +void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, > + struct cea_sad *sads, int sad_count); > +void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, > + u8 *sadb, int sad_count); > +void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, > + u8 *sadb, int sad_count); > +void dce3_2_audio_set_dto(struct radeon_device *rdev, > + struct radeon_crtc *crtc, unsigned int clock); > +void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, > + const struct radeon_hdmi_acr *acr); > +void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); > +void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); > #endif > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 8c63ccb8b6235..f6c783e19c988 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -38,16 +38,10 @@ void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); void dce6_endpoint_wreg(struct radeon_device *rdev, u32 offset, u32 reg, u32 v); -void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, - struct cea_sad *sads, int sad_count); void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder, struct cea_sad *sads, int sad_count); void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, struct cea_sad *sads, int sad_count); -void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, - u8 *sadb, int sad_count); -void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, - u8 *sadb, int sad_count); void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, u8 *sadb, int sad_count); void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, @@ -65,8 +59,6 @@ struct r600_audio_pin* dce6_audio_get_pin(struct radeon_device *rdev); void dce6_afmt_select_pin(struct drm_encoder *encoder); void r600_hdmi_audio_set_dto(struct radeon_device *rdev, struct radeon_crtc *crtc, unsigned int clock); -void dce3_2_audio_set_dto(struct radeon_device *rdev, - struct radeon_crtc *crtc, unsigned int clock); void dce4_hdmi_audio_set_dto(struct radeon_device *rdev, struct radeon_crtc *crtc, unsigned int clock); void dce4_dp_audio_set_dto(struct radeon_device *rdev, @@ -81,8 +73,6 @@ void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset, unsigned char *buffer, size_t size); void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, const struct radeon_hdmi_acr *acr); -void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, - const struct radeon_hdmi_acr *acr); void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset, const struct radeon_hdmi_acr *acr); void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); @@ -90,10 +80,8 @@ void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset); void dce4_hdmi_set_color_depth(struct drm_encoder *encoder, u32 offset, int bpc); void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); -void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset); void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); -void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode); diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h index 5c70cceaa4a6c..05e67867469b0 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.h +++ b/drivers/gpu/drm/radeon/radeon_audio.h @@ -81,4 +81,16 @@ void radeon_audio_mode_set(struct drm_encoder *encoder, void radeon_audio_dpms(struct drm_encoder *encoder, int mode); unsigned int radeon_audio_decode_dfs_div(unsigned int div); +void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, + struct cea_sad *sads, int sad_count); +void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, + u8 *sadb, int sad_count); +void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, + u8 *sadb, int sad_count); +void dce3_2_audio_set_dto(struct radeon_device *rdev, + struct radeon_crtc *crtc, unsigned int clock); +void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, + const struct radeon_hdmi_acr *acr); +void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); +void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); #endif
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/dce3_1_afmt.c:30:6: warning: no previous prototype for ‘dce3_2_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes] 30 | void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:48:6: warning: no previous prototype for ‘dce3_2_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes] 48 | void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:66:6: warning: no previous prototype for ‘dce3_2_afmt_write_sad_regs’ [-Wmissing-prototypes] 66 | void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:116:6: warning: no previous prototype for ‘dce3_2_audio_set_dto’ [-Wmissing-prototypes] 116 | void dce3_2_audio_set_dto(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:170:6: warning: no previous prototype for ‘dce3_2_hdmi_update_acr’ [-Wmissing-prototypes] 170 | void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, | ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:202:6: warning: no previous prototype for ‘dce3_2_set_audio_packet’ [-Wmissing-prototypes] 202 | void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:223:6: warning: no previous prototype for ‘dce3_2_set_mute’ [-Wmissing-prototypes] 223 | void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute) | ^~~~~~~~~~~~~~~ Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Slava Grigorev <slava.grigorev@amd.com> Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/gpu/drm/radeon/radeon_audio.c | 12 ------------ drivers/gpu/drm/radeon/radeon_audio.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)