From patchwork Mon Nov 16 17:36:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324476 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503948ils; Mon, 16 Nov 2020 09:38:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwEMlkHzQnIqpwsNyPnv0pH3PtS0BB9bUeq2cWLO2DB7Zf+y6iRCxUygjU4xj9W2k4DgncP X-Received: by 2002:a17:90b:a50:: with SMTP id gw16mr32777pjb.14.1605548315218; Mon, 16 Nov 2020 09:38:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548315; cv=none; d=google.com; s=arc-20160816; b=QUBP26/ARdSmozRyhCWJjD45fvKfASUSMpzeGDHfjF/6l0RxwX3UX9h3aY7MG9/+1E Nhjex5kz1w6OgEZi2U+N2BGBiOSxqzTQs2Fmf8NKW28BLjvOmmkt1sAA2MpZqJRemwYu 8CZF3L5bqy741FCPfZiG1uiGp4X3ZzILQ7wFGNfYnNNdSBbUjSUw8GidKgBiPSo8dk+r hWe/nPJkb8mKr9pP+MFQHs8kklVrJUtUwS7XpnVrNvRbLOnire7yQ1f06WfFs98deY0u Cqn7G29GQCjQyR8UVLGkLqG2kwfP4mHYqilpoM7cqJ7PuYdQB+KODtkGmV9BSpxgJUWG b4Yg== 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=U9cm0tkCahVhydSm4o3JzbsuTP0jyuuji3eFK5xSDl8=; b=OdzJHPyAvkfRj+EaOdAASRb/SbgfdKNduTzCeji63xz8AjN7Wc0wWJtbgppeYggHHp KVmx5LzMFxgRBK2TFq+YQXa7Tdk2P3XyNnL8FhA25N2Slel6viZ8IFjgKUNvLtzK2rn7 iLwwmL4nbTDaHZItRj6zZCcBJ0Hc3X2lnw1Rn4PG9SYW4NqFksycd5CZOOTI8KYQalA/ TqFbeKpxuMzd0WOa6P2Xr8tGalMC3+5L5GHOx9/s0oB77oDn0nelTZNghQhT6SdlZLjf FDKw1rZY63eznfvuRWg30+bDx2D0UXFpggVaFvoZre9opnxhALxCpnYf66/tWpcPwv9S Ch7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=APb2hd1n; 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 z13si1986pjf.150.2020.11.16.09.38.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:35 -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=APb2hd1n; 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 2A30E6E9EE; Mon, 16 Nov 2020 17:38:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5757C6E075 for ; Mon, 16 Nov 2020 17:38:02 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id j7so19635471wrp.3 for ; Mon, 16 Nov 2020 09:38:02 -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=rlEAJUPoPuRko8qcPnm4cjfW2HHwiXUkafYub7EdZfk=; b=APb2hd1nsrrBdjXvvVpm1+Ne8ZAFPtpGwaL1im+72RQeDbJ/GyceRoS9RYLJJEJK4Z 4mVviBHLv+iyqw0YOEYeonP95t7J30q5lCPEx/OujgV3Mf85YTdE/7io+lmgtDTgUKgm Gu28kdk0RJStN0MI2VoFiR+yen487Ho05eeI0VXQMFHMttYcPBivCrMkUwic8yE2GzIS +DvJ/w9be7VZZyBMGpB9iy851voGvbtU57ut5qLzrte2Spy/DSeVh0SZkggXu72ATVFz qQWhTPrTEQqQ2C59XfUjpK/am9B6P5hsrl+i4b/Je8gDXYWUy2Q+6+rqfK5m00+4CPX2 kxuw== 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=rlEAJUPoPuRko8qcPnm4cjfW2HHwiXUkafYub7EdZfk=; b=Vh655ssjFJrs+94VE2ZwQxU7Lclu9mnB1aykqgXm5xbmCUXqEhlDsF40hODAn1Toni 1pvV/eiJB02h1qd5OjqyqPy3QW/EzCn4awuQGl2RIMCIJmy0a0K0NGztq1Pmf7gdiDAu r5efKJdb+Bv7MHAienoSYoWcasnYQoqY7AFRpjh0IHpm1O1YAxqE6Y9idlC/fEoptnty pR7VRoVnBmSBIsgqblWN+IdN/MXameM8c9skpdbMY1FLOs1IvSiTztN9JKsQOZU4C0eI SZRNzdkl95CNRNt35hUEVZAhCksAM9qprtmXhk5nJbSNu9hKjouP6RvufCsgo5hCrG+l jOBw== X-Gm-Message-State: AOAM533jFG5qStKFP778azecJtiZOsi/wgAHr9PSsbw64RbiBHSKx142 Eyd0f0vh9QT/7fRXXlNMI7335A== X-Received: by 2002:a5d:4001:: with SMTP id n1mr13258021wrp.176.1605548280980; Mon, 16 Nov 2020 09:38:00 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:00 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 42/43] drm/radeon/radeon_audio: Move 'r600_*' prototypes into shared header Date: Mon, 16 Nov 2020 17:36:59 +0000 Message-Id: <20201116173700.1830487-43-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173700.1830487-1-lee.jones@linaro.org> References: <20201116173700.1830487-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 , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.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/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 Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/r600.h | 17 +++++++++++++++++ drivers/gpu/drm/radeon/r600_hdmi.c | 1 + drivers/gpu/drm/radeon/radeon_audio.c | 13 +------------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h index dbdff4568516b..22db13b256195 100644 --- a/drivers/gpu/drm/radeon/r600.h +++ b/drivers/gpu/drm/radeon/r600.h @@ -30,12 +30,29 @@ struct radeon_bo_list; struct radeon_cs_parser; +struct r600_audio_pin; +struct radeon_crtc; struct radeon_device; +struct radeon_hdmi_acr; u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); int r600_ih_ring_alloc(struct radeon_device *rdev); void r600_ih_ring_fini(struct radeon_device *rdev); +void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, + u8 enable_mask); +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); + int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, struct radeon_bo_list **cs_reloc); + #endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c index c09549d785b54..f3551ebaa2f08 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c @@ -30,6 +30,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" +#include "r600.h" #include "r600d.h" #include "atom.h" diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 785c23cb30589..7c5e80d03fc90 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -29,28 +29,17 @@ #include "evergreen_hdmi.h" #include "radeon.h" #include "atom.h" +#include "r600.h" #include "radeon_audio.h" -void r600_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); 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 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_set_audio_packet(struct drm_encoder *encoder, u32 offset); -void r600_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); static const u32 pin_offsets[7] = {