On Mon, Nov 9, 2020 at 4:19 PM Lee Jones <lee.jones@xxxxxxxxxx> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/r600_hdmi.c:177:6: warning: no previous prototype for ‘r600_hdmi_update_acr’ [-Wmissing-prototypes] > 177 | void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, > | ^~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600_hdmi.c:217:6: warning: no previous prototype for ‘r600_set_avi_packet’ [-Wmissing-prototypes] > 217 | void r600_set_avi_packet(struct radeon_device *rdev, u32 offset, > | ^~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600_hdmi.c:314:6: warning: no previous prototype for ‘r600_hdmi_audio_set_dto’ [-Wmissing-prototypes] > 314 | void r600_hdmi_audio_set_dto(struct radeon_device *rdev, > | ^~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600_hdmi.c:340:6: warning: no previous prototype for ‘r600_set_vbi_packet’ [-Wmissing-prototypes] > 340 | void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset) > | ^~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600_hdmi.c:351:6: warning: no previous prototype for ‘r600_set_audio_packet’ [-Wmissing-prototypes] > 351 | void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset) > | ^~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600_hdmi.c:393:6: warning: no previous prototype for ‘r600_set_mute’ [-Wmissing-prototypes] > 393 | void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute) > | ^~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600_hdmi.c:469:6: warning: no previous prototype for ‘r600_hdmi_enable’ [-Wmissing-prototypes] > 469 | void r600_hdmi_enable(struct drm_encoder *encoder, bool enable) > | ^~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher@xxxxxxx> > Cc: "Christian König" <christian.koenig@xxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> > --- > drivers/gpu/drm/radeon/r600d.h | 14 ++++++++++++++ > drivers/gpu/drm/radeon/radeon_audio.c | 11 +---------- > 2 files changed, 15 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h > index 2e00a5287bd2d..db4bcc8bee4e5 100644 > --- a/drivers/gpu/drm/radeon/r600d.h > +++ b/drivers/gpu/drm/radeon/r600d.h > @@ -27,6 +27,20 @@ > #ifndef R600D_H > #define R600D_H > > +struct radeon_crtc; > +struct radeon_hdmi_acr; > + > +void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); > +void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); > +void r600_hdmi_audio_set_dto(struct radeon_device *rdev, > + struct radeon_crtc *crtc, unsigned int clock); > +void r600_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 r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); > +void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); > + the *d.h headers are supposed to just be hardware definitions. I'd prefer to keep driver stuff out of them. Alex > #define CP_PACKET2 0x80000000 > #define PACKET2_PAD_SHIFT 0 > #define PACKET2_PAD_MASK (0x3fffffff << 0) > diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c > index 8c63ccb8b6235..a2be60aa3cec4 100644 > --- a/drivers/gpu/drm/radeon/radeon_audio.c > +++ b/drivers/gpu/drm/radeon/radeon_audio.c > @@ -27,6 +27,7 @@ > #include <drm/drm_crtc.h> > #include "radeon.h" > #include "atom.h" > +#include "r600d.h" > #include "radeon_audio.h" > > void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, > @@ -63,8 +64,6 @@ void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, > struct r600_audio_pin* r600_audio_get_pin(struct radeon_device *rdev); > 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, > @@ -75,31 +74,23 @@ void dce6_hdmi_audio_set_dto(struct radeon_device *rdev, > struct radeon_crtc *crtc, unsigned int clock); > void dce6_dp_audio_set_dto(struct radeon_device *rdev, > struct radeon_crtc *crtc, unsigned int clock); > -void r600_set_avi_packet(struct radeon_device *rdev, u32 offset, > - unsigned char *buffer, size_t size); > 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); > 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); > static void radeon_audio_dp_mode_set(struct drm_encoder *encoder, > struct drm_display_mode *mode); > -void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); > void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable); > void evergreen_dp_enable(struct drm_encoder *encoder, bool enable); > > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx