Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon/radeon_audio: Move 'r600_*' prototypes into shared header

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@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Lee Jones and committed by
Alex Deucher
312226f9 f9eddd7c

+19 -12
+17
drivers/gpu/drm/radeon/r600.h
··· 30 30 31 31 struct radeon_bo_list; 32 32 struct radeon_cs_parser; 33 + struct r600_audio_pin; 34 + struct radeon_crtc; 33 35 struct radeon_device; 36 + struct radeon_hdmi_acr; 34 37 35 38 u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); 36 39 int r600_ih_ring_alloc(struct radeon_device *rdev); 37 40 void r600_ih_ring_fini(struct radeon_device *rdev); 38 41 42 + void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, 43 + u8 enable_mask); 44 + void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); 45 + void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); 46 + void r600_hdmi_audio_set_dto(struct radeon_device *rdev, 47 + struct radeon_crtc *crtc, unsigned int clock); 48 + void r600_set_avi_packet(struct radeon_device *rdev, u32 offset, 49 + unsigned char *buffer, size_t size); 50 + void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, 51 + const struct radeon_hdmi_acr *acr); 52 + void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); 53 + void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); 54 + 39 55 int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, 40 56 struct radeon_bo_list **cs_reloc); 57 + 41 58 #endif /* __R600_H__ */
+1
drivers/gpu/drm/radeon/r600_hdmi.c
··· 30 30 #include "radeon.h" 31 31 #include "radeon_asic.h" 32 32 #include "radeon_audio.h" 33 + #include "r600.h" 33 34 #include "r600d.h" 34 35 #include "atom.h" 35 36
+1 -12
drivers/gpu/drm/radeon/radeon_audio.c
··· 29 29 #include "evergreen_hdmi.h" 30 30 #include "radeon.h" 31 31 #include "atom.h" 32 + #include "r600.h" 32 33 #include "radeon_audio.h" 33 34 34 - void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, 35 - u8 enable_mask); 36 35 void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, 37 36 u8 enable_mask); 38 37 struct r600_audio_pin* r600_audio_get_pin(struct radeon_device *rdev); 39 38 struct r600_audio_pin* dce6_audio_get_pin(struct radeon_device *rdev); 40 - void r600_hdmi_audio_set_dto(struct radeon_device *rdev, 41 - struct radeon_crtc *crtc, unsigned int clock); 42 - void r600_set_avi_packet(struct radeon_device *rdev, u32 offset, 43 - unsigned char *buffer, size_t size); 44 - void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, 45 - const struct radeon_hdmi_acr *acr); 46 - void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); 47 - void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); 48 - void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); 49 39 static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, 50 40 struct drm_display_mode *mode); 51 41 static void radeon_audio_dp_mode_set(struct drm_encoder *encoder, 52 42 struct drm_display_mode *mode); 53 - void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); 54 43 55 44 static const u32 pin_offsets[7] = 56 45 {