From patchwork Mon Nov 9 21:18:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 320990 Delivered-To: patch@linaro.org Received: by 2002:a17:906:d156:0:0:0:0 with SMTP id br22csp3000532ejb; Mon, 9 Nov 2020 13:19:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9/O6vyVbl13dV7/z4ly4lgn6LJNTeQ+sMo7WmPglvZGbGGfal+o3gsjZnOgXF1YdlqY05 X-Received: by 2002:a17:90a:a81:: with SMTP id 1mr1120642pjw.165.1604956782484; Mon, 09 Nov 2020 13:19:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604956782; cv=none; d=google.com; s=arc-20160816; b=MyH811EHcO2DwOSz41tEIYamHyqUabTWjIGxyPAVnClgSAh/CQqA8v2P4q3xoLYw7/ PnuX+x2U1/STAs21IJuxcy9S/9PLV9NoWKLwVeIrjpYn/0hgNOq4KCW1S6t4WaQwx4MH FbqOEb3liFRJ4SMT/XbPXW1JaAJaS17dUKIcz/P06lZ8rUGPdD6Mo7FA+dfDKSiZ0Z+M MAOx4SoBkdt/bBn9wEaHwiN51D+j0tw11NcPGkt9hL3WvujdEIkM3xXv+0dBxg4ggaLp mn4HzFHcJPpIpp0/2H0IyDYfrhASgPE1410WQbOYQoqsvsYF2A8zOHTpeJrRd9o9h/bX S+kA== 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=wxcvzvjc/MeVeTCaDOwBJE4u+qDfW5BGF448tfpUpW4=; b=OEcANUb6i0M5VWt3BX4f1b/85qK8pptWg443khFAeiedgOlt4s7+cxhyAG1OiGz8Ff T5jAsCGJfRMg7mjs5d2ak5tUc6tsLuRgIOpdQuiijfz/dqE19QQecYFYZz9GG5/uwTuG XPgciQYfMO+AYYzpCDNd4wVCWNV03oj6Hm8OyEKK0BNQa7FQFjqDPeUhyUlAsiLchPrG uJfnjj3QAR4Xi4l76viHCI3mKDHsDWDetduLXv+p5ofOlACYHUDUhfvGGRxemXUJNKjn 3DISY1e2M/z6SO2ekU7+HbDFJsFipsaiS3QVfz0NDfs61zFZlMsvs5MBWsGvXwcikbwZ KJzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WfKgy4ob; 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 q12si3782244pfk.184.2020.11.09.13.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 13:19:42 -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=WfKgy4ob; 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 B8104895B9; Mon, 9 Nov 2020 21:19:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4ECD3895EE for ; Mon, 9 Nov 2020 21:19:39 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id j7so3130538wrp.3 for ; Mon, 09 Nov 2020 13:19:39 -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=ivs8p7JDCUXGc2cgIvVJmvGG5nx3ukesj4jjJvZ5SP0=; b=WfKgy4obnGDp3z2oavqhYPYCnFzdi0qq4fJnhQ/qoTHYWdV0//xXiGiEEle9NiiUdZ 7dFOlv+0axSe3ldGBfDxL6JFPqmKylN+1qiz31crs+9Rpb6qTonbnnaSJGwZgB8hjo9h +zc49rSeTioIFp/20IaE0nrHmEZIYDpK932ajCNpkShNuDH8ULLH6laIlgPbR0ybXA4M FXweYKCt20GRWBnyc3Us0WylLtxa+svuwY24ACCllfgCkR1QvJPG+XRSEFN8fjIBoSWb othWv9Mrh390+GEdfa+GqnLN0EeG0Cuq7ydmY0zStvVzoKjklBlDW756Zg6K/Kig8v/I 4MSA== 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=ivs8p7JDCUXGc2cgIvVJmvGG5nx3ukesj4jjJvZ5SP0=; b=C0wCTr2pCMChBhkqJA14JLx2Y6Ai4TUd1jzo3y1c7wtxn+3HBFqFBsXul08LaRlfqT 2/MENW69HrT7Rkn/CxviE4gNe4I0rs7hck01zzg5+tRNYrfIr1UIC4IErlS8HBMM0C2U eUloQxJ2VxsznCIHNiDIK806HDwCneGsNVaQpfB0s+3ySQk2ygMuH6OxquVQHvbHhbb1 dBXSsDHuM8jKdAPRKt77pyuec9V+2X7ebjzJzPKYQSeZjTwfRGPrU7mdnzHy+EjsW3uk j3Ir49+DvKtvDicB09IIvP52GpCMiEXu/OHTfb6JJ5vbNws8ps8j8hezve7RUE3R0kDk NC3Q== X-Gm-Message-State: AOAM533ze9zMv10k87u3XMO/krG4AcStbEUeibDF4nTP+ZPsWKnBPbcu mNziqP1o2LoZFZWqpAQhU9D6DA== X-Received: by 2002:a5d:530c:: with SMTP id e12mr13994595wrv.355.1604956777979; Mon, 09 Nov 2020 13:19:37 -0800 (PST) Received: from dell.default ([91.110.221.139]) by smtp.gmail.com with ESMTPSA id 71sm15170630wrm.20.2020.11.09.13.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 13:19:37 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 15/20] drm/radeon/r600d: Move 'rc600_*' prototypes into shared header Date: Mon, 9 Nov 2020 21:18:50 +0000 Message-Id: <20201109211855.3340030-16-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201109211855.3340030-1-lee.jones@linaro.org> References: <20201109211855.3340030-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/r600d.h | 14 ++++++++++++++ drivers/gpu/drm/radeon/radeon_audio.c | 11 +---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h index 2e00a5287bd2d..db4bcc8bee4e5 100644 --- a/drivers/gpu/drm/radeon/r600d.h +++ b/drivers/gpu/drm/radeon/r600d.h @@ -27,6 +27,20 @@ #ifndef R600D_H #define R600D_H +struct radeon_crtc; +struct radeon_hdmi_acr; + +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); + #define CP_PACKET2 0x80000000 #define PACKET2_PAD_SHIFT 0 #define PACKET2_PAD_MASK (0x3fffffff << 0) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 8c63ccb8b6235..a2be60aa3cec4 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -27,6 +27,7 @@ #include #include "radeon.h" #include "atom.h" +#include "r600d.h" #include "radeon_audio.h" void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, @@ -63,8 +64,6 @@ void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, 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 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, @@ -75,31 +74,23 @@ 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 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); 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); 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);