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

drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI prototypes to shared header

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/radeon/evergreen_hdmi.c:37:6: warning: no previous prototype for ‘dce4_audio_enable’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:67:6: warning: no previous prototype for ‘evergreen_hdmi_update_acr’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:97:6: warning: no previous prototype for ‘dce4_afmt_write_latency_fields’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:119:6: warning: no previous prototype for ‘dce4_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:137:6: warning: no previous prototype for ‘dce4_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:155:6: warning: no previous prototype for ‘evergreen_hdmi_write_sad_regs’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:208:6: warning: no previous prototype for ‘evergreen_set_avi_packet’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:227:6: warning: no previous prototype for ‘dce4_hdmi_audio_set_dto’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:270:6: warning: no previous prototype for ‘dce4_dp_audio_set_dto’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:306:6: warning: no previous prototype for ‘dce4_set_vbi_packet’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:317:6: warning: no previous prototype for ‘dce4_hdmi_set_color_depth’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:354:6: warning: no previous prototype for ‘dce4_set_audio_packet’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:389:6: warning: no previous prototype for ‘dce4_set_mute’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:400:6: warning: no previous prototype for ‘evergreen_hdmi_enable’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:440:6: warning: no previous prototype for ‘evergreen_dp_enable’ [-Wmissing-prototypes]

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
dc872ff5 5acfb44b

+71 -25
+1
drivers/gpu/drm/radeon/evergreen_hdmi.c
··· 27 27 #include <linux/hdmi.h> 28 28 29 29 #include <drm/radeon_drm.h> 30 + #include "evergreen_hdmi.h" 30 31 #include "radeon.h" 31 32 #include "radeon_asic.h" 32 33 #include "radeon_audio.h"
+69
drivers/gpu/drm/radeon/evergreen_hdmi.h
··· 1 + /* evergreen_hdmi.h -- Private header for radeon driver -*- linux-c -*- 2 + * 3 + * Copyright 2008 Advanced Micro Devices, Inc. 4 + * Copyright 2008 Red Hat Inc. 5 + * Copyright 2009 Christian König. 6 + * 7 + * Permission is hereby granted, free of charge, to any person obtaining a 8 + * copy of this software and associated documentation files (the "Software"), 9 + * to deal in the Software without restriction, including without limitation 10 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, 11 + * and/or sell copies of the Software, and to permit persons to whom the 12 + * Software is furnished to do so, subject to the following conditions: 13 + * 14 + * The above copyright notice and this permission notice (including the next 15 + * paragraph) shall be included in all copies or substantial portions of the 16 + * Software. 17 + * 18 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 19 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 20 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 21 + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 22 + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 23 + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 24 + * DEALINGS IN THE SOFTWARE. 25 + * 26 + */ 27 + 28 + #ifndef __EVERGREEN_HDMI_H__ 29 + #define __EVERGREEN_HDMI_H__ 30 + 31 + struct cea_sa; 32 + struct cea_sad; 33 + struct drm_connector; 34 + struct drm_display_mode; 35 + struct drm_encoder; 36 + struct r600_audio_pin; 37 + struct radeon_crtc; 38 + struct radeon_device; 39 + struct radeon_hdmi_acr; 40 + 41 + void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder, 42 + struct cea_sad *sads, int sad_count); 43 + void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset, 44 + unsigned char *buffer, size_t size); 45 + void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset, 46 + const struct radeon_hdmi_acr *acr); 47 + void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable); 48 + void evergreen_dp_enable(struct drm_encoder *encoder, bool enable); 49 + 50 + void dce4_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, 51 + u8 enable_mask); 52 + void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, 53 + u8 *sadb, int sad_count); 54 + void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, 55 + u8 *sadb, int sad_count); 56 + void dce4_afmt_write_latency_fields(struct drm_encoder *encoder, 57 + struct drm_connector *connector, 58 + struct drm_display_mode *mode); 59 + void dce4_hdmi_audio_set_dto(struct radeon_device *rdev, 60 + struct radeon_crtc *crtc, unsigned int clock); 61 + void dce4_dp_audio_set_dto(struct radeon_device *rdev, 62 + struct radeon_crtc *crtc, unsigned int clock); 63 + void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset); 64 + void dce4_hdmi_set_color_depth(struct drm_encoder *encoder, 65 + u32 offset, int bpc); 66 + void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset); 67 + void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); 68 + 69 + #endif /* __EVERGREEN_HDMI_H__ */
+1 -25
drivers/gpu/drm/radeon/radeon_audio.c
··· 25 25 #include <linux/gcd.h> 26 26 27 27 #include <drm/drm_crtc.h> 28 + #include "evergreen_hdmi.h" 28 29 #include "radeon.h" 29 30 #include "atom.h" 30 31 #include "radeon_audio.h" 31 32 32 33 void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, 33 34 u8 enable_mask); 34 - void dce4_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 u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); 39 38 void dce6_endpoint_wreg(struct radeon_device *rdev, 40 39 u32 offset, u32 reg, u32 v); 41 - void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder, 42 - struct cea_sad *sads, int sad_count); 43 40 void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, 44 41 struct cea_sad *sads, int sad_count); 45 - void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, 46 - u8 *sadb, int sad_count); 47 - void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, 48 - u8 *sadb, int sad_count); 49 42 void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, 50 43 u8 *sadb, int sad_count); 51 44 void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, 52 45 u8 *sadb, int sad_count); 53 - void dce4_afmt_write_latency_fields(struct drm_encoder *encoder, 54 - struct drm_connector *connector, struct drm_display_mode *mode); 55 46 void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, 56 47 struct drm_connector *connector, struct drm_display_mode *mode); 57 48 struct r600_audio_pin* r600_audio_get_pin(struct radeon_device *rdev); ··· 50 59 void dce6_afmt_select_pin(struct drm_encoder *encoder); 51 60 void r600_hdmi_audio_set_dto(struct radeon_device *rdev, 52 61 struct radeon_crtc *crtc, unsigned int clock); 53 - void dce4_hdmi_audio_set_dto(struct radeon_device *rdev, 54 - struct radeon_crtc *crtc, unsigned int clock); 55 - void dce4_dp_audio_set_dto(struct radeon_device *rdev, 56 - struct radeon_crtc *crtc, unsigned int clock); 57 62 void dce6_hdmi_audio_set_dto(struct radeon_device *rdev, 58 63 struct radeon_crtc *crtc, unsigned int clock); 59 64 void dce6_dp_audio_set_dto(struct radeon_device *rdev, 60 65 struct radeon_crtc *crtc, unsigned int clock); 61 66 void r600_set_avi_packet(struct radeon_device *rdev, u32 offset, 62 67 unsigned char *buffer, size_t size); 63 - void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset, 64 - unsigned char *buffer, size_t size); 65 68 void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, 66 69 const struct radeon_hdmi_acr *acr); 67 - void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset, 68 - const struct radeon_hdmi_acr *acr); 69 70 void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); 70 - void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset); 71 - void dce4_hdmi_set_color_depth(struct drm_encoder *encoder, 72 - u32 offset, int bpc); 73 71 void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); 74 - void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset); 75 72 void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); 76 - void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); 77 73 static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, 78 74 struct drm_display_mode *mode); 79 75 static void radeon_audio_dp_mode_set(struct drm_encoder *encoder, 80 76 struct drm_display_mode *mode); 81 77 void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); 82 - void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable); 83 - void evergreen_dp_enable(struct drm_encoder *encoder, bool enable); 84 78 85 79 static const u32 pin_offsets[7] = 86 80 {