From patchwork Mon Nov 16 17:29:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324425 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498143ils; Mon, 16 Nov 2020 09:30:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOQ8ZApai/dT6ln9hlIAllpa0ZcYXzzWHL4qVIfejDdJII1D/PvRgJnoCKsFacTUz1r0Si X-Received: by 2002:a63:f50f:: with SMTP id w15mr208456pgh.403.1605547840921; Mon, 16 Nov 2020 09:30:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547840; cv=none; d=google.com; s=arc-20160816; b=cvk95gaviRzY0RS8FtcPBcvDV6OA9KBgC5Vh6J0dlzVSqEYX2EsRaYKlv9KndlhQIU 1S50YM+5Ry40v0ktda1YBeS9Hk2jXOsyMGZcJbSF3XGffrj+PNHi5g+jwcqrIN9VG2uD 7CIgyW4dN35gFmvvppVitfQmzpeOdBDMmjCeVaLdUZA2QPrWdqFh34apP/19ICLRhUuG vUlUbLMjfMvcr5MFe0hJH0ap+wMO1xRyw9Wap5byVsVtvIPJWqRHODxmAitcdirlNh9i thqYCMkkNA/50FtEF8zKZLyGoVimN2fhhv6fiXbSoeMleMAFDaTc5B6zfufU3aJxfpaG JXJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=OkcSi6CA0//B7r4vsToNiGTKxIz1hdEQJa8LObwrKXQ=; b=G2RWPy+QGk2/vvilPn3VItOzHSD1SJHnsaHM7ENOwNG8hR7j8Ib3hAE475Ez2t3Ux2 DzzkQoO97Zbx1/Vaeizy9unp6keNHTu2ce4puyC4fltDVUapX4bR4LznR8gUbGBDbkt4 hL+fGZYXYOkkrSoI1LQ80D+FZw8vJqWwXLcCQlbeffUMeYZ0va/Ay0ID/X5dK69PIvV2 GPbflfiZUf7rUErtjltL+ldgZVZLyu0sYpvm1F8yeXWUNkCXJsIYDNVI4DeVCCj7tdZB MnnZXCS8uRGTMkpGtG100f/aenbKPTmy71Pkyio50wYucpoqd9jv34oPHoYAYEkhZ6Ut lwbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="mk+//APT"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id i10si15835472pgl.132.2020.11.16.09.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="mk+//APT"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D68456E037; Mon, 16 Nov 2020 17:30:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC1A589FA6 for ; Mon, 16 Nov 2020 17:30:24 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id b6so19618187wrt.4 for ; Mon, 16 Nov 2020 09:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Em7SluU2l3ftJ+gF09xUH3G2q3trrqCt+WUDKP2B/us=; b=mk+//APTyPDZh9XKgwaFWLCLR0i63D5KO+mrf/fczt5j3iHIWaWmHSN9hpuKceQt0z /F4Lf873Ni/jDpPGpjZ66Yt529P0Pync7BDAyLV02jsKJiLKh59oQbuj1f1xbES68bQ4 XGTcqT0BnX1D/wo9PKt/cuUcfPmfhXYpxa7qYt42+HuQJIgga4xVfISU5ualkWcDy2qf d13FYI2/NWmwXFeOI8V0Rc4kk+wTQe5xDGbgNBJ7Ta1ww+vK5JKgri6EvuA6EF95szIV 2db48IppAEgbC9ueOh1S2t1tlCaKf5BW1sRepPAQd0mSYrF5Cd4HtaBsqcaOoCon6W3p LfXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Em7SluU2l3ftJ+gF09xUH3G2q3trrqCt+WUDKP2B/us=; b=CABNYCvWPr0aIYL2I0FoKewuctc1DT71UmHPxhjZBn1YGfgGHADG422ItwnIL6sC/I z/Cb+8+5VNjqaPC8fR++H1FVtAsrUkRRGWrYDqkWVxjH9+L4c0Ye7OM+gniXmZAklj6R xXd7HgQm6sB5SbMvb0Z3mCNdddOvbh81duf0jSAOCDoS1oPvl270ysGwPaZ0+OiPFM0b QuL6r5zSWdHyIwO+HXJdp7ON9QKBY3BHR7+DRwEQtUiGkTba2rT8evXvFy4uQuSP+X+S 4q7wMptYCrRpOY3vBR2T4rg4/Z2897UjIfvSGf2XWYE//S01SN6PbglgkoI0+TiVfJ16 xixA== X-Gm-Message-State: AOAM532Qba+c+t72gEhLfUpC7gbFJ/F3eUNhCVX+AxSlkwPDxrRXxbmw qUlnTc56R8GMHo+Y+o5nmnn0Zg== X-Received: by 2002:adf:9544:: with SMTP id 62mr20166979wrs.223.1605547823586; Mon, 16 Nov 2020 09:30:23 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:22 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 11/43] drm/radeon/radeon_audio: Move 'dce3_2_*' prototypes to shared location Date: Mon, 16 Nov 2020 17:29:33 +0000 Message-Id: <20201116173005.1825880-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Slava Grigorev , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Slava Grigorev Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- 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