Re: [PATCH 17/43] drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI prototypes to shared header

From: Alex Deucher
Date: Mon Nov 16 2020 - 15:02:01 EST

On Mon, Nov 16, 2020 at 12:37 PM Lee Jones <lee.jones@xxxxxxxxxx> wrote:
>
> 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@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>

Applied with minor changes. Thanks!

Alex

> ---
> drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 +
> drivers/gpu/drm/radeon/evergreen_hdmi.h | 69 +++++++++++++++++++++++++
> drivers/gpu/drm/radeon/radeon_audio.c | 26 +---------
> 3 files changed, 71 insertions(+), 25 deletions(-)
> create mode 100644 drivers/gpu/drm/radeon/evergreen_hdmi.h
>
> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> index 739336a48d085..5f3078f8ab950 100644
> --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> @@ -27,6 +27,7 @@
> #include <linux/hdmi.h>
>
> #include <drm/radeon_drm.h>
> +#include "evergreen_hdmi.h"
> #include "radeon.h"
> #include "radeon_asic.h"
> #include "radeon_audio.h"
> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.h b/drivers/gpu/drm/radeon/evergreen_hdmi.h
> new file mode 100644
> index 0000000000000..c86276b8d7f58
> --- /dev/null
> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.h
> @@ -0,0 +1,69 @@
> +/* evergreen_hdmi.h -- Private header for radeon driver -*- linux-c -*-
> + *
> + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
> + * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
> + * All rights reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> + * DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#ifndef __EVERGREEN_HDMI_H__
> +#define __EVERGREEN_HDMI_H__
> +
> +struct cea_sa;
> +struct cea_sad;
> +struct drm_connector;
> +struct drm_display_mode;
> +struct drm_encoder;
> +struct r600_audio_pin;
> +struct radeon_crtc;
> +struct radeon_device;
> +struct radeon_hdmi_acr;
> +
> +void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder,
> + struct cea_sad *sads, int sad_count);
> +void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset,
> + unsigned char *buffer, size_t size);
> +void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset,
> + const struct radeon_hdmi_acr *acr);
> +void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable);
> +void evergreen_dp_enable(struct drm_encoder *encoder, bool enable);
> +
> +void dce4_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
> + u8 enable_mask);
> +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,
> + u8 *sadb, int sad_count);
> +void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
> + struct drm_connector *connector,
> + struct drm_display_mode *mode);
> +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,
> + struct radeon_crtc *crtc, unsigned int clock);
> +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 dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset);
> +void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute);
> +
> +#endif /* __EVERGREEN_HDMI_H__ */
> diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
> index f6c783e19c988..3cc53db04d645 100644
> --- a/drivers/gpu/drm/radeon/radeon_audio.c
> +++ b/drivers/gpu/drm/radeon/radeon_audio.c
> @@ -25,33 +25,24 @@
> #include <linux/gcd.h>
>
> #include <drm/drm_crtc.h>
> +#include "evergreen_hdmi.h"
> #include "radeon.h"
> #include "atom.h"
> #include "radeon_audio.h"
>
> void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
> u8 enable_mask);
> -void dce4_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
> - u8 enable_mask);
> void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
> u8 enable_mask);
> 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 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 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,
> - u8 *sadb, int sad_count);
> void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
> u8 *sadb, int sad_count);
> void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
> u8 *sadb, int sad_count);
> -void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
> - struct drm_connector *connector, struct drm_display_mode *mode);
> void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
> struct drm_connector *connector, struct drm_display_mode *mode);
> struct r600_audio_pin* r600_audio_get_pin(struct radeon_device *rdev);
> @@ -59,37 +50,22 @@ 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 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,
> - struct radeon_crtc *crtc, unsigned int clock);
> 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 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 dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset);
> void r600_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);
>
> static const u32 pin_offsets[7] =
> {
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel