From patchwork Mon Nov 16 17:36:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324436 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3502938ils; Mon, 16 Nov 2020 09:37:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJze6VXKNdGBOzVFRYu8g0aRRQZV+zD2ftfcJXV1AkvrhZNW/jiGEuaDxTKZNfKVJCAHgEte X-Received: by 2002:aa7:8704:0:b029:18a:e2c9:c38 with SMTP id b4-20020aa787040000b029018ae2c90c38mr14483871pfo.79.1605548235977; Mon, 16 Nov 2020 09:37:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548235; cv=none; d=google.com; s=arc-20160816; b=1K2++b+LjX0n40+ag4xpBxV3JbezqbQ9xb/myAiusr2MTdyt6+Lvzk60ZpxFa710rG ePNDRdKhgVxFqsdMneK2wCV5euUrlsBUWAACto6GXBp41L1Q0Ujty1AGDxACZstVSv/h na4tDXMTHYFfVK+/6Tv4xCv/wHhXPvZdcM1r06yR1T4W5GacXN7G9TjKuAO+3zJG73ux cNKguaYU+JVOUflt/nF+M6mtDZmDyxB5AOle3Otka0n17HuI4wuKoUiGQeeOHpuBbc4u Ee3/zJ8fkZjYaLV3bhyzaWB38g3VqmwY2pcnAr3NbjW7/J6AXYu1IrXEzji94DsuCCW+ 2wWg== 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=ot4SWUAjr7XFzqCysQxwf1NlC/UeuZH1wGPzbh9G49Q=; b=AwLLmSsToeHct/LGftGf3mpFUHc1edXFLwEyuUm9FHSfhvE5ba2HuuG77cYGLsdsrR z4xSpkQmrELYjYEfH9jCH9GFZx6o6LfyJviCCTkV58cd1t3xTr7SYH/FWv0U59Rd05mv BaRvT4Des/Ec58LBaSTvEqhhRW55QKqpJoG6Zt/niCaFW1euxs28qHEa8bPjQEhz/7Ug m9Hwl0eGoMJVDrhg7JCnWn1qsXU+NtT4K5mQcvu4wDz076tTMwUErRMI94/hMEHFonLu A7uOH2PONEawMnPH7QuBhr7g2sudRBLwPADILMxN0lqvD2f0BpNbghSs1O+tYbj8009s ZmVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Rp3u8Jwo; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id g15si4762pju.120.2020.11.16.09.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Rp3u8Jwo; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 DB13C6E038; Mon, 16 Nov 2020 17:37:11 +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 5D82289FA6 for ; Mon, 16 Nov 2020 17:37:06 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id p1so19596972wrf.12 for ; Mon, 16 Nov 2020 09:37:06 -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=Xb5oU/OD2Y3rEdVts+1SNNg+EwKMwAAR+VS8s4ifyQw=; b=Rp3u8JwosxZh0tOeegPBxxchLmVOYDwvYReTo37Z7mS8aEPbmb6WEaUD6M5dTaExSd xzcQJ4Sq1/oi3Lxxv8GqyecBWbauJ2CVW/X7CT+hhZiz9m4wmSUKFokcNvpH6fJEkPzB QOz8TiyiEQpjN7gUlhkDZH8soePq9CURV8V1prdX9MPZFc777IyoWRW42CCdNhNBO5Y3 npVM63rsAmWkWqXDUYLzA/Vrq40jzzHFZ9tshka692aiawIxhXa8tYxkiqEvRKizwNkR uX6ikzRdIoBV7hQ+3w+iZ+3uF5yMJ2D8HpTAjwF4jqxFOuvg550DFPYirq6Vp15qcLdY +Nxg== 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=Xb5oU/OD2Y3rEdVts+1SNNg+EwKMwAAR+VS8s4ifyQw=; b=WnNqc2+zLatrIFJsooXMjrQuvghxlumNfaE1ygEY4DM5jmwDdEiZkusdlhatUBUtJA ugCP8KLOToPsnE5FkfiwlNUWZ0OtLd1/RuCCH1Ji4cbjFMq5kNW1cMCrZU9eYi5hXT6v MlcN1JHgGlZIq51h5rwzw+NnuryJ8UrKP06hlwt2mtz/t2Ew1XBcUjvvkAI2y4nersw+ E7XmljHa6803YPBGGsstoxTOLoJ84FDDYgeXSGV62juiJqD+0g97n8v1cGg9nf8VKm7K Q97ybqr8K7sOYuQCVKxJ+EsJtGRZEkqihOoWn21gjSKc1gD66j+ioevK6hTyD3CBTBQH JqXw== X-Gm-Message-State: AOAM533XZf4e9W5wNEUWWG++lSuLKGHwUydQLIvxuZ4MFtPSbFXKRr9Q 4DTxc5ERafhyelg2NQpJJYU8Gg== X-Received: by 2002:a5d:654b:: with SMTP id z11mr19684774wrv.291.1605548225053; Mon, 16 Nov 2020 09:37:05 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:04 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 01/43] drm/radeon/atombios_encoders: Move 'radeon_atom_get_tv_timings()'s prototype into shared location Date: Mon, 16 Nov 2020 17:36:18 +0000 Message-Id: <20201116173700.1830487-2-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/radeon_atombios.c:1791:6: warning: no previous prototype for ‘radeon_atom_get_tv_timings’ [-Wmissing-prototypes] 1791 | bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ 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/atombios_encoders.c | 5 +-- drivers/gpu/drm/radeon/radeon_atombios.c | 1 + drivers/gpu/drm/radeon/radeon_atombios.h | 37 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_atombios.h diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index cc5ee1b3af84f..683de198e18d9 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -33,6 +33,7 @@ #include #include "atom.h" +#include "radeon_atombios.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" @@ -296,10 +297,6 @@ static void radeon_atom_backlight_exit(struct radeon_encoder *encoder) #endif -/* evil but including atombios.h is much worse */ -bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, - struct drm_display_mode *mode); - static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 5d25917251892..71bf2ed172697 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -34,6 +34,7 @@ #include "atom.h" #include "atom-bits.h" #include "radeon_asic.h" +#include "radeon_atombios.h" extern void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, diff --git a/drivers/gpu/drm/radeon/radeon_atombios.h b/drivers/gpu/drm/radeon/radeon_atombios.h new file mode 100644 index 0000000000000..b7c76920feb7d --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_atombios.h @@ -0,0 +1,37 @@ +/* radeon_atombios.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2007-8 Advanced Micro Devices, Inc. + * Copyright 2008 Red Hat Inc. + * + * 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 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 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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. + * + * Authors: Dave Airlie + * Alex Deucher + */ + +#ifndef __RADEON_ATOMBIOS_H__ +#define __RADEON_ATOMBIOS_H__ + +struct drm_display_mode; +struct radeon_device; + +bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, + struct drm_display_mode *mode); + +#endif /* __RADEON_ATOMBIOS_H__ */ From patchwork Mon Nov 16 17:36:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324435 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3502910ils; Mon, 16 Nov 2020 09:37:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzeJgC4LWAtDJ2gRNfY0s7jT6HPDU8e9LGL9rjOEYAFQHUJxqXPSIW7sY5BklZuOgNoL9ab X-Received: by 2002:a05:6a00:4a:b029:18b:3748:8931 with SMTP id i10-20020a056a00004ab029018b37488931mr14293732pfk.61.1605548233338; Mon, 16 Nov 2020 09:37:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548233; cv=none; d=google.com; s=arc-20160816; b=seWtVUFhmedOvkubp556xE2db86hQRdtSxKghckOdpX7wwAnFR27a8bU0foAJRnlP4 Hhv5tWQWJs5mXF0Xj6NT6CtMelwPRxjzTYl5YeDROb98aJ2ERrXZvyadNRLEdsBO24G0 jRn95U2EfR9upRgYXq1alQVxaOVIh2lMYra5VdNNKkYVF8yxWZkoiM7jmPAolz1axbqa Caj3cccFRRldzFdImisBzRJ3TTQ4N379O4IS36cX36w194UtEbI+2Bxgc7lS5y1zLqTZ 3yDKmoTq7iGZetg2fmsA4WQXydYKdMGxIdFD8ju4pXGCitRznAPfFTtTg7RhiZsNqm3M T4/w== 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=8B/zFKl91YZIjj6T9jjNsJnAWqTGS8KmjH5DmNFC+Ms=; b=YBLhWEcIMSV7d259hjxS/X2Y0hhxSDdCoM05/R2q1VdyYUEJ+x/GxO1MqZRmiAM9OK qaYqmRuGOUUG+GzA/L424i3E0UMtGdoohaFzAAn4/Omw2oIhVOBpSK8mmUuq9cGNk082 rj/9pItQfX+IkO2QEPngJpdErFI9xWTQun6zJkCDkb5rXFURGGk/BOoYHdiavUoLkuwZ dQjA6bDJ9AUoypr/tF/G4BTaoOshA5Lu8WbHh8CjPX/vr69LsWfSdramkugYeI1nhOgz ZxKPxugmP6zDeJkk2h43UvOeHFAKCzgUAt8NiLCcW4vgm0dGimHMOtYunfuVew2q86nO Iz7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YrJA3W0C; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id e8si18055pja.67.2020.11.16.09.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YrJA3W0C; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 C6C746E02A; Mon, 16 Nov 2020 17:37:08 +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 981226E038 for ; Mon, 16 Nov 2020 17:37:07 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id k2so19676816wrx.2 for ; Mon, 16 Nov 2020 09:37:07 -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=o9jTMX+lMkxyW4xpU+ilcx7gbWHjRBMJqKFY5D9XSUE=; b=YrJA3W0C9dsPwTP/yfNgQAL9bO2bgqXFQArq4CGYlu7c0P+DN7wbawX9LjnxuhvONe 0quf3FrequM/kbem6PqJGbgOqmH4dK8JhvnywHvc14Exnz7jAqeyyf9bwYRWCxcSlbb8 e0VPOgEpGP757EDJ9zmk04yi14jhswRxOecc+Zamzk/uCgzYjg0t91Xi3v1zoTRpV08E BlFq71iMwA3q6+kZpJPWrij4diWJje6TGuw8ZGjP5wrEK3YP7LRRiRJCo8uPb4D4CRiT pScKHrntlfXnHZ75BhMpZ4l7sodrF3bTTSW32JnIQt/VeI5R4A36DnCBBPiSRCPhEmJY 219w== 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=o9jTMX+lMkxyW4xpU+ilcx7gbWHjRBMJqKFY5D9XSUE=; b=UaYUaYTMAUIVt1OAofFnrZvcugND46rWom8l1erpH00ZkPdwG+ENCIZvIib0KHn/s6 IrpdNv+fL06QkuStVmqskSEae0ZvdO9GS0bJ0Kx8K2oxJFZFm6Dg6KkYwPgw8gjNTiqU kAjCNxa4RzY+sjSXgJTUuHH/f+MfxqFs7UKDKV8GqLtO/JnjL4BlT1HsH8jDkoR1uzDN cR+jEt19Dxzf1pE8cGe2cEh4UVnrleWSLS+jGoUYmfBZNBkIS+mTCOlyngPtZL9A7uGe YzZTBQACKVS8gd59ApvUU9JmWrw3ZGdNfLcyGMdFIm1wy/DjHj5g8OSvrnHpiZile2u5 msew== X-Gm-Message-State: AOAM5301YHzbMsGrndLXpy5v09G4VNpQhJ7lVAX3vst8zioMYlywnT2B 2+qsMZFs8aS5CYZS6wEf1Y9gZQ== X-Received: by 2002:adf:c547:: with SMTP id s7mr20526713wrf.222.1605548226270; Mon, 16 Nov 2020 09:37:06 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:05 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 02/43] drm/radeon/radeon: Move prototype into shared header Date: Mon, 16 Nov 2020 17:36:19 +0000 Message-Id: <20201116173700.1830487-3-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Unfortunately, a suitable one didn't already exist. Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_device.c:637:6: warning: no previous prototype for ‘radeon_device_is_virtual’ [-Wmissing-prototypes] 637 | bool radeon_device_is_virtual(void) | ^~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_device.c | 1 + drivers/gpu/drm/radeon/radeon_device.h | 32 ++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_drv.c | 3 +-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_device.h diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 7f384ffe848a7..ad572f965190b 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -42,6 +42,7 @@ #include #include +#include "radeon_device.h" #include "radeon_reg.h" #include "radeon.h" #include "atom.h" diff --git a/drivers/gpu/drm/radeon/radeon_device.h b/drivers/gpu/drm/radeon/radeon_device.h new file mode 100644 index 0000000000000..3112b99ae36f1 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_device.h @@ -0,0 +1,32 @@ +/* radeon_device.h -- Private header for radeon device -*- 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 __RADEON_DEVICE_H__ +#define __RADEON_DEVICE_H__ + +bool radeon_device_is_virtual(void); + +#endif /* __RADEON_DEVICE_H__ */ diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index f813eb5e140dd..536b246b9a6aa 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -52,6 +52,7 @@ #include "radeon_drv.h" #include "radeon.h" +#include "radeon_device.h" /* * KMS wrapper. @@ -293,8 +294,6 @@ MODULE_DEVICE_TABLE(pci, pciidlist); static const struct drm_driver kms_driver; -bool radeon_device_is_virtual(void); - static int radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { From patchwork Mon Nov 16 17:36:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324439 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503017ils; Mon, 16 Nov 2020 09:37:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvTE6xxdn/qv4OW5PloeUneGphJwmJnNXfJe3VEFOAuzrHObVMNILLRhpEhXu+MzWER1un X-Received: by 2002:a65:4241:: with SMTP id d1mr286939pgq.18.1605548241388; Mon, 16 Nov 2020 09:37:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548241; cv=none; d=google.com; s=arc-20160816; b=LkdpWR4Obxo2KefAElp2G9MrFcCqrlpwVdRN9kkQa2CTTKJBwqwn4UBX0St5aDmPzQ 1zjNPsEoqVQ2kOngGkYQd1AH7XCkj2UpixgtwQ2iKjmDDYKxTY1EJudh3QWrz+jhUmKJ QmxDh8i2sDjPPbNJV+YrNMOuzu4jcDcUrol7kQN1k6BnLvkIZt4I8rRVjqg8PM3y/O4Z 3iQeyxN3cj0tYJoA9aXDoWPIPE2amjzc4cv+ETz+MTRRMKQCiuT6c3w0wEYKa+5sGgbS yV8XBMx76Y6Bdtk8IjR9rM8Mb4AizB+ZzMv4T9U7Jbvyv+W+VJX6TqwSV8BmoCv1nelo jPkw== 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=hoTs9gbnvK84Hi0O1oJSBW1Ugx+V+xkyBQge5cqpc9o=; b=ru/cDFvAWWsttAr12e/KUiWwE6upJ1X1vTF7D6DmbVLsY8i0gR7HFChagPVG61qtVc xXYhIA6JLAC0BowUQXJfVOtesRRDlMNv+CrNEw3XZe/odTts9Hr92wiwTqS0DWnSvHSc 50BQCUEbh5tSYuNXq8dwcifJfqbRcBY9w9faEq4MqSZLzlexC/U3tFYrEjccSmFZTMVd PSMLSquOTwo/qKKQs9VqLczF3MW7uZMa+2rcdXfDhsPGi+WvDwziAWCrTGDG8ygje5Xx tMfHY1tGC0nvSAUvxlt0NL98sL4v2CEqkKB7nVRmFs8q4xyR/9xQ4Zhhuye+wWyai0Db GXZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=j+ldD9rm; 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 j10si16616537pff.81.2020.11.16.09.37.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:21 -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=j+ldD9rm; 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 9C8DE6E03C; Mon, 16 Nov 2020 17:37:16 +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 A92F76E038 for ; Mon, 16 Nov 2020 17:37:09 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id r17so19661500wrw.1 for ; Mon, 16 Nov 2020 09:37:09 -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=XmKc1pxfWNIhhVZbat4IeYMq2SqMBDzsHL5Wfk03ato=; b=j+ldD9rmaT6SeiUqabg7hZGWX7ysLDbYkfSm2AtognLMox9o+AH58OYgL2YeXXY79W xDNWBXkEAKttVFiCe9VnQTLN2pHAy/nzubqM5xwwpHf/DVRczWgHYC0UNUcTvMIVchKU pibCfX872RdJcV/lS54hsoB4UYzO50yTxaqWnXvCnCqmpVt06BmYl0UbC8LxcJEnYLLm 35s/1AJXP/ggRAxPfhRlNEYKbeecRLtoMTY7RzfR3OItnMnDZ66wLmtiyCrjuTJGG93V ciXz2R7BoqATKtQj3vRXCll1mq36jv4/QUjn0y1GRvNu0s3rSNG2wFT/A0J4RvAFOehm 3TpA== 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=XmKc1pxfWNIhhVZbat4IeYMq2SqMBDzsHL5Wfk03ato=; b=ViH/cWv1pkp226CCH6fFeAod9oP/bM0zpWttTP/sHrETdMs0T3mywDjmOXeaoOTOYB jZ7r2Yp8TbqUVbNVLhtQjHxxUD4jPzegf/RroN2AXPHop/K4oO8EqJFXb+z2P04iioeA T4sjccvBy+y9RKg+0Swaqw83ms1fS636WbjLhWLbmAFu2vjfxKQpmlwp446nmrR11Gzh MZMt9dtvdSggNlBtywNxOORxVFhMbZFtAhStdGBGqMPDfQ8mLeIMIHjzl6DM6O13XyoT UZteqizS01FKEigeN4pn+PrwqxWhW3tzPjGiinlLD4mGxou3+o02NlgyC/cNRGJZizc5 CTEA== X-Gm-Message-State: AOAM5325X+9fz/qDOCtH5Bevu3suHIZGhSr1ZOm2RQH1rjOZTaUpwYto L4FqDeT6SF+Sd2IAylkhcALfFA== X-Received: by 2002:a5d:488b:: with SMTP id g11mr21838475wrq.210.1605548227541; Mon, 16 Nov 2020 09:37:07 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:06 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 03/43] drm/radeon/radeon_kms: Move 'radeon_*_kms' prototypes to shared header Date: Mon, 16 Nov 2020 17:36:20 +0000 Message-Id: <20201116173700.1830487-4-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_kms.c:756:5: warning: no previous prototype for ‘radeon_get_vblank_counter_kms’ [-Wmissing-prototypes] 756 | u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_kms.c:826:5: warning: no previous prototype for ‘radeon_enable_vblank_kms’ [-Wmissing-prototypes] 826 | int radeon_enable_vblank_kms(struct drm_crtc *crtc) | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_kms.c:853:6: warning: no previous prototype for ‘radeon_disable_vblank_kms’ [-Wmissing-prototypes] 853 | void radeon_disable_vblank_kms(struct drm_crtc *crtc) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_display.c | 1 + drivers/gpu/drm/radeon/radeon_kms.c | 1 + drivers/gpu/drm/radeon/radeon_kms.h | 35 +++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 drivers/gpu/drm/radeon/radeon_kms.h diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index eb0d4cb95f0a6..3a6fedad002d7 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -44,6 +44,7 @@ #include "atom.h" #include "radeon.h" +#include "radeon_kms.h" static void avivo_crtc_load_lut(struct drm_crtc *crtc) { diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 3d31c04e4b3db..001940bca90a6 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -41,6 +41,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_drv.h" +#include "radeon_kms.h" #if defined(CONFIG_VGA_SWITCHEROO) bool radeon_has_atpx(void); diff --git a/drivers/gpu/drm/radeon/radeon_kms.h b/drivers/gpu/drm/radeon/radeon_kms.h new file mode 100644 index 0000000000000..36e73cea92154 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_kms.h @@ -0,0 +1,35 @@ +/* radeon_kms.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 __RADEON_KMS_H__ +#define __RADEON_KMS_H__ + +u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc); +int radeon_enable_vblank_kms(struct drm_crtc *crtc); +void radeon_disable_vblank_kms(struct drm_crtc *crtc); + +#endif /* __RADEON_KMS_H__ */ From patchwork Mon Nov 16 17:36:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324438 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503043ils; Mon, 16 Nov 2020 09:37:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJweORMJOHOY4vYnNOHN/D3F4EBk1rKkt79UPwJAou7LX++7LOqMXqDhNf7sQqpHvXFxYf5F X-Received: by 2002:a62:d11b:0:b029:18b:b3e:95aa with SMTP id z27-20020a62d11b0000b029018b0b3e95aamr14543147pfg.3.1605548243583; Mon, 16 Nov 2020 09:37:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548243; cv=none; d=google.com; s=arc-20160816; b=CK1shJ7xJVonxZpjKr455juNTGL3+Kf4c/yhu6P0a46WlmMle+dgmpw6fTjxV6PNNL RfaSPev7V3dq0+lLHu/g76VepqgH4NsZlv4Kn5BRJNfMRL8aXKFzN1EHcWyukbLoyvwV HV9ciO5AJdYB5bUgFERg5hbYcLqltBY1JjoCXdBVPLs0TyffoJPvuydfh+wtdvFSpwc4 Ep9cn6s3u+UzjUj+iiqJl//SJmwzeZiEkBmGK8icZB01z2+B9m9D/xw1o6WMzPd2X1ZW 3jd/b7JeksoCMWpn3ZCvRFeRo7tiOnzKapgUj2eTY+tN5B6Yhb6DzjRoTFinio/1XJaR 0biA== 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=Vhn8iaoPssYFbSgujId4BxhX3IB+mRlXJaOjVT+g4Yc=; b=SnUqtGxBbpB0wbzlRb1P2srz1AERU9a3O9qQ2lgM7jxef0+B8575EkdsfwJuFb9FTV lJVStU0EE3RcCggEC085YCxOWZ03xn3J5GpyjlzOT60mYWPeypWBplCutfZzjxtjpdVR X/891it9COWqgtHP22RujmMrJUl02OsffwuoRbcI7yiTvFgg2vGAG6kd4hGQYIeVRVye LmeqHFXCxtiyjAP0eI4NFyu9I7akfQwZZ7lqZf8xu8pOIZnzC8b9jW37aOGA1lKQQeC2 Un7VJcVMC89XVGRrB1uJ8CPlFm0iiVXCkxwQPyUERux2AYILzlIuDYabX9VGlH2yeZpW yCag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=d2v+UQdD; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id b12si16292964pgd.413.2020.11.16.09.37.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=d2v+UQdD; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 B40756E049; Mon, 16 Nov 2020 17:37:17 +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 E681289F3B for ; Mon, 16 Nov 2020 17:37:09 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id l1so19618899wrb.9 for ; Mon, 16 Nov 2020 09:37:09 -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=brKpubI9m6t0/lslbRm7JoHNATZX8LOe9ERcjH2dq1I=; b=d2v+UQdDsneXlTN6mpwGtQa1JII7loaPK7FtyMdxwBh94nR+RMRJ2sdDSYWiWA4Gdi Fsfex/7l3c1d762P+eJfgiwtQweyGf+VyN6BqpR170YJE1cYPNRrZ2c4aQsXcc4rPdZJ otnuSbCzU3hogR5xqxla71Y0DxcVOGr3gnwv3HURcr7LQCg51B+f6/qNZ//m5TOu71hA gR9IG8kLM7fkPhoX4mWRd0t02ouUlxB7dBZQQN1h8Sc4P4hwG3Px8zuCPyOsPqB5Pz2m lsqp/V2hrnhwY7hSpbuRGaQ44N+AU0CUgjVfNQhR9LEgD9IWQYmyikJu0q16dQ81tnF+ pGIg== 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=brKpubI9m6t0/lslbRm7JoHNATZX8LOe9ERcjH2dq1I=; b=uQQkElbQB3xxcrZRCB3ndFenmmawkfNkKJ2IS6Rrg8sowIkAQS7yzITXEiMrj4t1Dy fgU51S9YSa7W/y6Rmo00dmh94gauBoRTX5fXFvbkxZGsLzeqSlv1H84B7zO4FnnpXRum lkE7I+SSc+yhxwrXtWtpv4k3wxUc1vMGfGbOQbHkN9NCUtTiu5Rjn0AxOelj0kkIYN5A KJBnR2SEZV35/ngUx3kDMmH7Jze4OUoxrWPWHOMUULLmJjDKgch8pPV+jMvQooVeT1TO gEJnmOJkxuziSqyulN8RmBZVmrz8U3JM8iXHVRY/wgY6Jp7S6xE7kDf7bBZarvF4dbzD 68+w== X-Gm-Message-State: AOAM5335RjmZMn5VN1NKYC0feRIZTbin2G5difxslugXKffHOWN7kXkb OH7qRJqjr9tGYKQ0DCdH4z+LKg== X-Received: by 2002:a5d:4612:: with SMTP id t18mr20435374wrq.401.1605548228653; Mon, 16 Nov 2020 09:37:08 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:08 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 04/43] drm/radeon/radeon_kms: Fix misnaming of 'radeon_info_ioctl's dev param Date: Mon, 16 Nov 2020 17:36:21 +0000 Message-Id: <20201116173700.1830487-5-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/radeon_kms.c:226: warning: Function parameter or member 'dev' not described in 'radeon_info_ioctl' drivers/gpu/drm/radeon/radeon_kms.c:226: warning: Excess function parameter 'rdev' description in 'radeon_info_ioctl' 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/radeon_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 001940bca90a6..50cee4880bb46 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -214,7 +214,7 @@ static void radeon_set_filp_rights(struct drm_device *dev, /** * radeon_info_ioctl - answer a device specific request. * - * @rdev: radeon device pointer + * @dev: drm device pointer * @data: request object * @filp: drm filp * From patchwork Mon Nov 16 17:36:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324437 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3502978ils; Mon, 16 Nov 2020 09:37:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpzjFLeQZ1d5HuY2vHqaSG8BTqRee/7Lgf+kWPcAeOHP4RBagDg3ENkmXtbJSXQE0a/tdu X-Received: by 2002:a17:902:c405:b029:d6:e86e:d434 with SMTP id k5-20020a170902c405b02900d6e86ed434mr13693864plk.65.1605548238811; Mon, 16 Nov 2020 09:37:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548238; cv=none; d=google.com; s=arc-20160816; b=pPkqJDivHPWZcd5JKZMmJoDbwst8fjRgNBaT5qqT0nFzHV9gKm6y7aZM8NjzbbTbPJ hgjXTo2/08rXA5WnDRHv42QAyrV8O2558OnlGERbAfGHdPzqfP9LvyUlpfAhVYVDAji4 IyRAxzpViTCukaJJfJWBW8aP3mg17H7BodSP0VsIPLuMDNLbn2g1v0RSbKZTnL4WTqKr 1Ik+sP01mXURLvSGyjDGIj2in5Ucd+ci4LUazlbDytmfvXDeeZrpA+v7heSVabhQb7Bq XuLa6MdeofEeqSNea9z+ZPP3ApELDFP9GsT4V8uuqSFaZcTgj0/gQ8BVdxJsUFYTXKeQ livg== 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=jjx5HyJBA1rogkW8pVA7zB2xKF+PxN/L8yj62StNoIg=; b=vyf/UC5BMX9mnTNTo6kg/fzdSf8OHGQ4Pt3DxRq3RmVWALsrEIWO+VkJLLz8Jvh2jw 6vn++1pySfL+kdTs0DR2lIG5OncWasbHo/RE+jgU8p/SaAXgZVn65ZRGKmj9wtyT9kIb HGa3wtOQkjWKUp4yUhFYWYTH86MACEOiTewEQEbg0zKH5vca1Sst/65vA3f08HXR97fc 9VRPCwyopkIhocuCADYsgPwl94ePDpsExH2Weor/3XluzkqgIhTf2qXP1BJoc2rbZwT+ B9lPPKuW+2IrvQwTAFxU+tx79ycbASL/AwiUGCvWxZ18beuT23pwZTkirw5UMjUQAiYN yl/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=mPuaAhSd; 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 w14si16271436pfd.37.2020.11.16.09.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:18 -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=mPuaAhSd; 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 C2B8889F33; Mon, 16 Nov 2020 17:37:11 +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 4B3F489F33 for ; Mon, 16 Nov 2020 17:37:11 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id s8so19607652wrw.10 for ; Mon, 16 Nov 2020 09:37:11 -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=Sc1pkIB+FW/k5gLv6YQPQhC4CZ1RwfaoeaGhthq0b4c=; b=mPuaAhSddpX0TY3ZOxs/irH2uOKqIchw+XgeJzhGsetdcsBXHVK93VOGNAfvw00h2A RXXmy0+ahdAZxG37S0KzyocdNXVyH1e4Luo5P6OGLZUH3UmeHNgJhubVQ0P//WvV23EM FlsR3laPq+0oWJlRkbm8x9gXl91boEdF8JdRy9dO8Es04tZC9zAaS//aUF+KveB8SpSk uD4Okgb3cB0vsK7Iu6ALQ5nYFNr+Y7gM3OGe4WAz/RiItYAIMlMGMl62RJetUQLtVH85 FywTI4ViK53ViNmFVMYUo00yJwlS00aQBZ0C+XZ2Grt6XYuogGK9d5W0nlntcX9vOCUs 6dhQ== 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=Sc1pkIB+FW/k5gLv6YQPQhC4CZ1RwfaoeaGhthq0b4c=; b=s3LhMeffkXgmZVUo6xUY7Beot1ln7dbM3faQ9VxP5rzV2bdmWnol97E7ZiPQedA2Nt dxUkhZosI3VPVx1s6k6hLYRxuKUKamAEHoWueEZnQYf+R4PFqrkj4sAngG5M4st6R9NG k+3AivPxTpMvn32e7ou3LR6PXvlYoDicambt2SGZxJz8hschERE8CUiRM9vU2naVHrMm t7dTZPRvDg9FgTSUPPpQsk4DhsKryyRreb/Ex3/iYczO+eNnEpX9n0nCba6MKw6QpSHI 6EBlW8gNpjKQGoy2Fhl/lNEbngK6u6OVjlSaXEnoyMnoy9d8PwK0/qOheMbhstL/wUyC aKQg== X-Gm-Message-State: AOAM533QSbZgQPCIq9cVll58AsqwHORnxbn7G2p2NCuuehIXel/O/KFP gZ9gYIEUTzxzCCd1JkNT5vmvgQ== X-Received: by 2002:adf:9e48:: with SMTP id v8mr21993925wre.55.1605548229923; Mon, 16 Nov 2020 09:37:09 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:09 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 05/43] drm/radeon: Move radeon_ttm{init, fini} to shared location Date: Mon, 16 Nov 2020 17:36:22 +0000 Message-Id: <20201116173700.1830487-6-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_ttm.c: At top level: drivers/gpu/drm/radeon/radeon_ttm.c:817:5: warning: no previous prototype for ‘radeon_ttm_init’ [-Wmissing-prototypes] 817 | int radeon_ttm_init(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_ttm.c:878:6: warning: no previous prototype for ‘radeon_ttm_fini’ [-Wmissing-prototypes] 878 | void radeon_ttm_fini(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_object.c | 3 +-- drivers/gpu/drm/radeon/radeon_ttm.c | 1 + drivers/gpu/drm/radeon/radeon_ttm.h | 36 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_ttm.h diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index ab81e35cb0606..8bc5ad1d65857 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -40,9 +40,8 @@ #include "radeon.h" #include "radeon_trace.h" +#include "radeon_ttm.h" -int radeon_ttm_init(struct radeon_device *rdev); -void radeon_ttm_fini(struct radeon_device *rdev); static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); /* diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 2939e71ceb700..28b300ed200ea 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -51,6 +51,7 @@ #include "radeon_reg.h" #include "radeon.h" +#include "radeon_ttm.h" static int radeon_ttm_debugfs_init(struct radeon_device *rdev); static void radeon_ttm_debugfs_fini(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/radeon_ttm.h b/drivers/gpu/drm/radeon/radeon_ttm.h new file mode 100644 index 0000000000000..91ea7141bc812 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_ttm.h @@ -0,0 +1,36 @@ +/* radeon_ttm.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 __RADEON_TTM_H__ +#define __RADEON_TTM_H__ + +struct radeon_device; + +int radeon_ttm_init(struct radeon_device *rdev); +void radeon_ttm_fini(struct radeon_device *rdev); + +#endif /* __RADEON_TTM_H__ */ From patchwork Mon Nov 16 17:36:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324441 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503083ils; Mon, 16 Nov 2020 09:37:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwX9Fkih1G8ZB1RLg0CPM/EF9iSFqgnj5DEBL3pbRHg6jq1qH7LaU1Yfe/inMLiRjotUplV X-Received: by 2002:a65:58c8:: with SMTP id e8mr236931pgu.407.1605548246934; Mon, 16 Nov 2020 09:37:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548246; cv=none; d=google.com; s=arc-20160816; b=DFv0lJBhJA7vAW2jg0s6/X8B3hVus6wFuroOvDT8kzBSvEw6UFMK/F59E/0Wztsmtl 3lxbcH0gf0FDhGDQ4UHY8smQjZ3CgxqnfGgz866zuknUwomhHwtKgMssaYa6uKyu2JKa FcYqGhUlaSBk3hGimUakEuh7CyuiN4+UyDX2FTkkidsZcoLNxF3Nb61iC0KCV9hK2q+z OA09/Bu3YmoSskxcID0huOaEw7+shY/n/4tEVwbukMdbv0xCuwTLrFD8QCq/AshDLRmF y7tSvUdznT0ecuNpgIcYcmb2Wp3nKyB3lqrS2cETe10yBT3hx/J01gRhjQR3A2KjJGu4 0dQg== 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=88qn00GmLUhi1avVRuC7vlGxKdLo3EmbKXvqONR7hB8=; b=RQdlYyYgJMWWsm5afFJdGTi7QmDv0r8m03RmFLYOJStBxfP74hKwXNCKKIwYc+hMWB VdXCzfRH/8xKD1x10x81HqkVgUwQxftnmD2FHVMvgbRs9RyVhRi9BAURAdH7xaanaD9F rbRsnLKfGgg3DTheiK5ZeEWBIsf3mJKcUIgfjulNjqTAVcEETTOhES3bQ8Mglza3TrgN 7zqYzlvpCpVWuSpvJA6hWov3J0dNenBz8xteiGsgJGCAyyzN4no+hXK/MtcWU8/YNa1g kAcIyBfn/pRr+J8pnUjLORpAN7VJEbPObLV4//KrKweOV6n3tzR9v9YKfBQzYIkGEo0c hxxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WEr8pecm; 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 j16si17622052pgh.375.2020.11.16.09.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:26 -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=WEr8pecm; 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 41D866E048; Mon, 16 Nov 2020 17:37:18 +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 A0DFB6E041 for ; Mon, 16 Nov 2020 17:37:12 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id d12so19595183wrr.13 for ; Mon, 16 Nov 2020 09:37:12 -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=XYd0yK/RTvMALAHwJymskqLfNpbt6qhOE1pCsWZvd64=; b=WEr8pecmVcQpaa9qceSySCD2vox/S8lGFDWchqRJOaIQXEFSmatxKOyeMN6ZCx5CYN bxACTDZJiWuve0C2b771BjAYvKJB5gfVCyzLruL3v+xGiCEd/C2jj3Ja6PlrY/zVXHMX ZuTtUfjgNIWmZ6XXlDN33ZnpA9eZKUMXSC+Itq8OKilmIzjeiBPPESRSQncbt6mVyu3+ LMyc1xo2uNcIShlOfOnSgrNEQXZzIygifCFX/MuZX0WGSuCS5+zeWIMCA5E4EvYZ6E/K NFIuCIGVfnUqL3dY178Nuxa6qiktAgWEKc9YuOWvnYVt+AEEPVfUt9e3JTQ4Glut5Ax5 A8qA== 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=XYd0yK/RTvMALAHwJymskqLfNpbt6qhOE1pCsWZvd64=; b=iaES3cwXsGjT437DVm55FQPqe+t6aueI3tcziLXXjuEk9rTRZaNZpeBvcoXZ+jstJp 8O8rI4wNNkgZ/5IAfelLGdFDDhAj92S8LTxryzw3I5yDl7wmqsH+tYuvSL7JteHGcYOy NayeXMPWpWNQlPNm7D1yxdEPw74bEjSAKtty9GAPwSMg1JcjBfhUju7R2KoiSdqamrhy q7bD0GWVK/r+8rlg3AN/h0tixBCwwWsDNLazKElr+eqDET7rNbJ9K4/yBZewu5Rr207X VNu3W+NpF3X/NQOVOvRccydhA8SV7v1/ttzkxxk9ngEcq+3Gl947XVEZM+6QZuD0mRHX SjYA== X-Gm-Message-State: AOAM532KX2gvVlGb8OzxN+/kcWULBCcSsLIYMrXoddl9xVRyb0fU1TFk 6fzXfwy4DHYkUapyim2eLGZ9ig== X-Received: by 2002:a5d:5342:: with SMTP id t2mr20138778wrv.243.1605548231323; Mon, 16 Nov 2020 09:37:11 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:10 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 06/43] drm/radeon/radeon_legacy_encoders: Move 'radeon_add_legacy_encoder' prototype to shared header Date: Mon, 16 Nov 2020 17:36:23 +0000 Message-Id: <20201116173700.1830487-7-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_legacy_encoders.c:1745:1: warning: no previous prototype for ‘radeon_add_legacy_encoder’ [-Wmissing-prototypes] 1745 | radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_encoders.c | 4 +-- .../gpu/drm/radeon/radeon_legacy_encoders.c | 1 + .../gpu/drm/radeon/radeon_legacy_encoders.h | 34 +++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_encoders.h diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index ced022fae19d7..b60a373d3ead3 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -31,11 +31,9 @@ #include #include "radeon.h" +#include "radeon_legacy_encoders.h" #include "atom.h" -extern void -radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, - struct drm_connector *drm_connector); extern void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, struct drm_connector *drm_connector); diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 44d060f75318e..e64fd0ce67070 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -35,6 +35,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "radeon_legacy_encoders.h" #include "atom.h" #ifdef CONFIG_PMAC_BACKLIGHT #include diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.h b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h new file mode 100644 index 0000000000000..a80b387559d4d --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h @@ -0,0 +1,34 @@ +/* radeon_legacy_encoders.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 __RADEON_LEGACY_ENCODERS_H__ +#define __RADEON_LEGACY_ENCODERS_H__ + +void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, + struct drm_connector *drm_connector); + +#endif /* __RADEON_LEGACY_ENCODERS_H__ */ From patchwork Mon Nov 16 17:36:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324440 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503062ils; Mon, 16 Nov 2020 09:37:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0gHB22i1Jc4eqh44bplmwInCkYXulyECLQI0c677eeaqhxdg2CXP7jtVKSA0N20P7Zol9 X-Received: by 2002:a63:5853:: with SMTP id i19mr257125pgm.333.1605548245351; Mon, 16 Nov 2020 09:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548245; cv=none; d=google.com; s=arc-20160816; b=IW3GslAEWUkmToujFQkXFpQh258Z+S2vqZfexwyQY3jNAU7/2O8L+FdDZJazWOrHUn ig7qokS6e/e8+2QDXF1ftLuQFourjrI83k83r51oTjzDi/j+WXKjGAoYe71d7F9SthM2 zN7AQyxGOxBRuzFTWi+ZcsiZe8NYuNPGuXGhPeV4V2ar3TWuf4toqqU2q/+R1057749m dR8x0g5mgrHbV463U3C6o+ynADzUNTlXNV3Y/hsLj36ATGlsXNg4AQySU71LAJNblUHh K3k3nr1QdqODzm+3xyWUslx+rzUB20pnxQ8VLKoL1SwpGjj+5sQYl1b6UiqYfhY1orV5 kBTQ== 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=/3QCBS65ceIQZeA3J2KPKPxU5FQLmYcuCy9zNv8MsbU=; b=bMx6JnKu5Js/aG2zCakH3+o39cHndFrBV/TtO/OD697HGmFlinBoVS/8YIwZvLYaut rTMqrM7GChkhxKIpcO91DPOx2LXUsOOs1mWOgNYo0dJ6DH1zlMCMawKw/giwMieSqBhN K+YZU1LApNpOAk25YE5L2R5Q7Gx03G+F3kx+jDoqQsKlR0asce1+DREzb9NaJdBOu7wp 5rDxT9olwIFFdO/UIivj/LPYSXb3cWSzEqkZvroZPRFsmSNH1xUacfZpwx9aTC/IchJ9 HJZJ8tj2pRi5HzKhRE3ypmY+QsRkrc9vG/HXLAwKJdvOgSqMmcj12o8LwKqibLD3bEDk zA/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Vc5GZewO; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id d8si15058379pgv.555.2020.11.16.09.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Vc5GZewO; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 A138D6E041; Mon, 16 Nov 2020 17:37:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC4CD6E041 for ; Mon, 16 Nov 2020 17:37:14 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id o15so19633304wru.6 for ; Mon, 16 Nov 2020 09:37:14 -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=oQB5rAR+1+kEveAEir1T88yOeq9CZP66J4NDJ9xsMf8=; b=Vc5GZewOWwNVlQxibWBU3viESAoqgPega2X6NU2xDrzPEahsS9QUDJyPFhPBGFxdC7 HBykf6FEj3VInb3HC2V6P17mmyOfqFSHC5kzDIQ8keYwRRL+9LrGlFxItlQxe7LbDUgS LvE8HF7vZOo6iSgSePndqpGMp3P+yqXd28lpYJEDSCVc082lkOLc+G3gnEmolCbEa894 QD/47FaLCwFsP5QUfCCyofyVYQkoOV6DyHCYDTFnyF6pxQF1iMWWrePksIFBvIVqxZFF WCeD2yvs8YItRj9sXCz0v5tGaQqPL9HrZnmh7TOfWG5b/iViPG4YuTZeBPSFhxFB7ae2 Nzvw== 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=oQB5rAR+1+kEveAEir1T88yOeq9CZP66J4NDJ9xsMf8=; b=Lt+8ws4KmLF+RF78aSKOU4uMiec/zJQltaiEAKl2SJjNA79n0ne8hFoC97m7i1tTyM tFPDgHDr1XLIitPabD5cy3vXZ+jufZo8Ju6lIAseWqdcJsztQIOxv0uOAobqhoIFqzM0 6tAKudCMCS2MWEIDr3V2INl12A2RIyugdXkz4XJsUJokQxWc2k7k7MVm4C3WyXWy+8KE MjA5kQM4OnEAdTZcDpV1RENn/O9qhFwu+rrG067dTCC6x+zcroAtyDO7hUiJa3OmOWsJ JrZlbYqrRDyCJvQs7s1MvmQ/8Vmy6hgQwBUQlQu9mJrB7HkARVNdplWEeStPCJ1nMU1H Yqlg== X-Gm-Message-State: AOAM530Y/CprzX3qzqsfcIdSkInM2O+CYbMY8FOSW/xLp0nSHJggUgVK ZedL5OETQ9w8Fy45lJndA0NVWw== X-Received: by 2002:adf:f881:: with SMTP id u1mr21824326wrp.103.1605548233683; Mon, 16 Nov 2020 09:37:13 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:12 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 07/43] drm/radeon/radeon_legacy_encoders: Move 'radeon_add_legacy_encoder's prototype to shared location Date: Mon, 16 Nov 2020 17:36:24 +0000 Message-Id: <20201116173700.1830487-8-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_legacy_encoders.c:1746:1: warning: no previous prototype for ‘radeon_add_legacy_encoder’ [-Wmissing-prototypes] 1746 | radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_atombios.c | 6 +----- drivers/gpu/drm/radeon/radeon_combios.c | 6 +----- drivers/gpu/drm/radeon/radeon_legacy_encoders.h | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 71bf2ed172697..cc80651b25773 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -35,16 +35,12 @@ #include "atom-bits.h" #include "radeon_asic.h" #include "radeon_atombios.h" +#include "radeon_legacy_encoders.h" extern void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device, u16 caps); -/* from radeon_legacy_encoder.c */ -extern void -radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, - uint32_t supported_device); - union atom_supported_devices { struct _ATOM_SUPPORTED_DEVICES_INFO info; struct _ATOM_SUPPORTED_DEVICES_INFO_2 info_2; diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index d3c04df7e75d7..ff2135059c071 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -31,6 +31,7 @@ #include #include "radeon.h" +#include "radeon_legacy_encoders.h" #include "atom.h" #ifdef CONFIG_PPC_PMAC @@ -40,11 +41,6 @@ #include #endif /* CONFIG_PPC_PMAC */ -/* from radeon_legacy_encoder.c */ -extern void -radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, - uint32_t supported_device); - /* old legacy ATI BIOS routines */ /* COMBIOS table offsets */ diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.h b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h index a80b387559d4d..f4c7432267e67 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.h +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h @@ -30,5 +30,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, struct drm_connector *drm_connector); +void radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, + uint32_t supported_device); #endif /* __RADEON_LEGACY_ENCODERS_H__ */ From patchwork Mon Nov 16 17:36:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324442 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503109ils; Mon, 16 Nov 2020 09:37:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyp5NIo/yZuwoKxWPFWBl1AkOg/ErEjbNyZvj7XuAfeI4guWhwmG3LADbNhWuXbVCdwWdcF X-Received: by 2002:a63:5042:: with SMTP id q2mr285707pgl.170.1605548248587; Mon, 16 Nov 2020 09:37:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548248; cv=none; d=google.com; s=arc-20160816; b=MgqPTOXApjM2ao6yNpLrMfdjnb5vvpyevIlIeQGlmxH7XC437pyztp2gukLZZEQO6c n0oZiQ3QCTcceFjjgLsHH2jwc+bl5pxadZCN3TuQ0h9Bk8vyOjAwZAR/kUqGz2f3kSbx PC+VXEFYf0nqx2lM1TMyDSq0YJClhfoM3GlZ2iwL0pXk0tWyttv/rROqdsE09oyN1Bej mxQ1++TVHrV3UKfQ08ZNUTIwYupggZzsmOaakbe8954fTce9CpSGDsBNCZDGP9KzEAe0 drOXNPrt4gta776F6YcAnxKWD9U/WZEF8Kb7IBqpz9ntg8HzGJ79EsrJZIsx7NT6Zvg3 5AAg== 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=KBeLGLUbap4IW/xRcl7EgyXjHZP8y8Q1XqbL0HjUaoI=; b=HJd55t0drvrFdJTwOo5guWoWGxd7MZw55txT8L3Y/QnEtB+/zF8Hp/XWDztrWKsWYF OMNYr7e2GjiUEkAN6KBdCtzNfYlIhmjc2hCm6b0fnlZcdAAeZQVJQd5CAJ6cB+qkI1NS R412rAUe+tkmPOy2UCqEavD9skTWingnX+kjKMOGRF5GqHKA6ln9XA0xmWBlRKI+ahox 1D3QW2ZShk+HCE8UaH6hI8AUSv+0JkmEzSf8JuDtZS2buDzDToI030kMFj/AgloA9xtt HrTWSU/0QDsmJMP8QP4nq3Us78h1y5GPV7oBqp2azQ3dFXzHyfZAZZVRzzWrBhKVaH3k 2fkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vjRgiF3s; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id x8si12916183pgg.578.2020.11.16.09.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vjRgiF3s; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 8034789F3B; Mon, 16 Nov 2020 17:37:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 14DF66E042 for ; Mon, 16 Nov 2020 17:37:17 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id w24so36754wmi.0 for ; Mon, 16 Nov 2020 09:37:16 -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=iZGU4hgv9ySSnT3lm5gi+Q8yFIEoSUWPQdVLIUJTRR4=; b=vjRgiF3sSV4IhUHRkfrW6zpxaiOTAP5+ndmpMJ5njzwICymUi4FgUOeakjFqSbhu4P Ux+bCPQFOWiIKcYf5U+jGLeG+dNLaoDVDRnxbur3utiqelyXUWvmqV5okLCcKN+XHXGK 3PTAT4CET3cVGb445Pcpfunq48d+MHHvGL8PFGirnEA9uULw5eR0b38qaAFibnFf2Kg8 Vv06ZwvmKCQdSstEOvE6BbwJlK4BDuM8nEZo67fVcHjSfstZ/2DVeffUp/aDK3dofOkn 3AsUz+crAA5fDsvaAni98zlrqW8tFV4fJAe46+wuXXTDPWp3Dt6Dr0c1P+61dZyZYABK cSFw== 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=iZGU4hgv9ySSnT3lm5gi+Q8yFIEoSUWPQdVLIUJTRR4=; b=fpHNdvq7J7yFO5JW+bGRyXr8NgUnO2uDXICGP3pTBqa8bZ3zUqRQuv8qqwpKOMYM3c DhNN08UIq5HxwKswwDNd+TcMGR6apRhPh8LlTtzWcSK0UtPvBWD9Q7yTckLgN63DY3Kz GkythNzTHrdMRkLwmJdhulQqvGMMLjliIsyTBpd1XsUDdpWdCDvk67A6agUUgWiB59wy i7/JWU2TpbYB1NJyP/TQPZMRzZ2jLvECatfhRhxsGAstm0Gj/aRyOXF161kLRqjaYXNU Y9n5H1DZVY/dHLrmjJnQ24xIGEJBtj1p1shmkNJUy/AYaDNqXy/17RTgM2k20h1f+2Mp KfmA== X-Gm-Message-State: AOAM532CmGkvwHrRe5q12kIxVbd+wQSRYdrUZBn8UGcyXZPUQWWabq6V Y8/Z5oPve17p0zSEj3WKwOgoQg== X-Received: by 2002:a7b:c201:: with SMTP id x1mr23442wmi.42.1605548235694; Mon, 16 Nov 2020 09:37:15 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:15 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 08/43] drm/radeon/radeon_irq_kms: Demote non-conformant kernel-doc fix another Date: Mon, 16 Nov 2020 17:36:25 +0000 Message-Id: <20201116173700.1830487-9-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/radeon_irq_kms.c:56: warning: Function parameter or member 'irq' not described in 'radeon_driver_irq_handler_kms' drivers/gpu/drm/radeon/radeon_irq_kms.c:56: warning: Function parameter or member 'arg' not described in 'radeon_driver_irq_handler_kms' drivers/gpu/drm/radeon/radeon_irq_kms.c:571: warning: Function parameter or member 'n' not described in 'radeon_irq_kms_set_irq_n_enabled' drivers/gpu/drm/radeon/radeon_irq_kms.c:571: warning: Excess function parameter 'num' description in 'radeon_irq_kms_set_irq_n_enabled' 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/radeon_irq_kms.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index b86bc88ad4308..a242b6053d47e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -43,11 +43,9 @@ #define RADEON_WAIT_IDLE_TIMEOUT 200 -/** +/* * radeon_driver_irq_handler_kms - irq handler for KMS * - * @int irq, void *arg: args - * * This is the irq handler for the radeon KMS driver (all asics). * radeon_irq_process is a macro that points to the per-asic * irq handler callback. @@ -549,14 +547,14 @@ void radeon_irq_kms_disable_hpd(struct radeon_device *rdev, unsigned hpd_mask) } /** - * radeon_irq_kms_update_int_n - helper for updating interrupt enable registers + * radeon_irq_kms_set_irq_n_enabled - helper for updating interrupt enable registers * * @rdev: radeon device pointer * @reg: the register to write to enable/disable interrupts * @mask: the mask that enables the interrupts * @enable: whether to enable or disable the interrupt register * @name: the name of the interrupt register to print to the kernel log - * @num: the number of the interrupt register to print to the kernel log + * @n: the number of the interrupt register to print to the kernel log * * Helper for updating the enable state of interrupt registers. Checks whether * or not the interrupt matches the enable state we want. If it doesn't, then From patchwork Mon Nov 16 17:36:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324443 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503129ils; Mon, 16 Nov 2020 09:37:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiRSGI+ZLUSxQqueuc4EkU0I4FO45RTNfglJReG3QXoJfQwfqD2sE9fcZ3yCM19+qMah86 X-Received: by 2002:a63:e74a:: with SMTP id j10mr293591pgk.208.1605548250186; Mon, 16 Nov 2020 09:37:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548250; cv=none; d=google.com; s=arc-20160816; b=bavdeq7QUhshVdj5bsuggQwqERjTwg8x7cRo4grrplTrq5f1P3F1QVb239WNUGbaOo UJkhSzv7DVfLPhhc4rR1phrawTw/1oEvCrgT6b1ZUIEPjA7xilrQnMMsEUU7KxzOYLtd EoHMWCyOLnfozvDtX3zZmah7iyBc3gQS9INy/8S4cdUNjW6OT9lkhWIImFeWiGyVJAfN hrROwmrayGVPmGtb/BlSk1/oOSRvnB30J4PJwL/caDDaVXj2J44C9YuCve2ozVNXfykE WNA3NitAP4cuL2GNJz49uiFkBp5LxBfB1hZEm4Ty8H5tR25itZOgbZOXDqQhBv/iIB4y AkJw== 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=NG6DGGKX0SzTnZOKhU3GfLzSC7PeiS3d5tgiATyKskE=; b=HDlNynHHN+UtpNjmbOOybeLllcWYeAbdMrGlDxpZkFefAyssNUUWwIfXjeDyRkF74E KG826BD1QYSlakT/f1epDkEC3L084ovNoVTEle56OoeOJdYheCOz1AuNdu/zwFcMOBb3 Jy0Jh4jNigzsogef2KFvjoMeUTkQ2TdBnQAyPPaFo5QAnkwrk8EriUvAxczN0XM7V0FR kKQdU+DAIB/okomkk36T22HvBEbj+Fpb6ppAhxg78fEtNxOlq/1NRbOA2A0VcUVSgHg3 QfCEHlrDTXkBzrqy2mACZ3//qT1shRA/a4LC9cqVbdgqQraY7PwUm3Jh2IArpg0it2FH JhOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hTWZaiHU; 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 w12si15861977pgj.363.2020.11.16.09.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:30 -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=hTWZaiHU; 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 0C2A46E057; Mon, 16 Nov 2020 17:37:20 +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 41D9A6E04A for ; Mon, 16 Nov 2020 17:37:18 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id b6so19642498wrt.4 for ; Mon, 16 Nov 2020 09:37:18 -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=uEdGEUBcwEa3ohTuW8AeQ9rcZ1jBGC5RhjVmwh26pbA=; b=hTWZaiHU5fA5ZEMniy8xudnbSwhiny/zhSVePhdiq89nhCPAqFfplsSB+RtBDA9Swn juht6Ir7HpAMfXv4ScFXAsNlO84L9fi8UKMVHx0469PTgEnG7RU+JC3CcpdCemKIZXx8 vm6UZT1j4n7/Za58lJeoGRUQL0XZbOjAfrAjAnTcihGjkQt0n2vkQzHJkumvOskI0GMu wCvk4wvT0a9BK+yMiaMCGStDtdCsu92UEgPHSneLHt3Val2FZknJqkH7U9a/Pvg627BP zikms0bVWuvecz6aP5XLhupjyFpePbGYDowsuDLp91S09GlZeFTh1psutp5sMF3tqsVc I5Dw== 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=uEdGEUBcwEa3ohTuW8AeQ9rcZ1jBGC5RhjVmwh26pbA=; b=c0joRIKOaHfWgEnq8SBKyFufjC1ASo1v8NET66hcp8Y5BagWhyPOkwjtH9XlPArNBT XHZ9bayArr26rCMLzbV9B9f0o6bom5wlJ83QO48FD/pNiT8NM+0PrF7sf+BZMJbiLvHd iaYgQzTj9mxySNBbp+bJERYk6n7fV6el6muI4JLXkc59xKyfsgRAbjWcm0c+M5x0+5Co DjxjfsG2VX0Duvf+qFD4b/8We+HCSdCJ22/zrHdviYkySyMDv/wamwbUyDgHOsTX0jU7 lStvvFHGIo3rcs3CffdYBSZ7eX7AZ1BMfRSbfu90aF3wz1P6nuDmEcw53GOShvibNnMN 3SMg== X-Gm-Message-State: AOAM530QGURIAVxYTkCecesHp9acyYh+ZUVZX3+iD+4TrXtG23LKT7b3 8X4QJDS+oq1QgPLmfr9vXxUgqA== X-Received: by 2002:a5d:4ec2:: with SMTP id s2mr20423096wrv.258.1605548236915; Mon, 16 Nov 2020 09:37:16 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:16 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 09/43] drm/radeon/rv770: Move 'rv770_set_clk_bypass_mode' prototype to shared location Date: Mon, 16 Nov 2020 17:36:26 +0000 Message-Id: <20201116173700.1830487-10-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/rv770.c:1138:6: warning: no previous prototype for ‘rv770_set_clk_bypass_mode’ [-Wmissing-prototypes] 1138 | void rv770_set_clk_bypass_mode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~ 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/evergreen.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 1 + drivers/gpu/drm/radeon/rv770.h | 35 ++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/rv770.h diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 1f2acca437abd..9a1e240b07234 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -31,6 +31,7 @@ #include "atom.h" #include "avivod.h" +#include "rv770.h" #include "evergreen_blit_shaders.h" #include "evergreen_reg.h" #include "evergreend.h" @@ -223,7 +224,6 @@ extern u32 si_get_csb_size(struct radeon_device *rdev); extern void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); extern u32 cik_get_csb_size(struct radeon_device *rdev); extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); -extern void rv770_set_clk_bypass_mode(struct radeon_device *rdev); static const u32 evergreen_golden_registers[] = { diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 12a918335ac7b..f09b6dc5cbeb3 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -40,6 +40,7 @@ #include "atom.h" #include "avivod.h" #include "r600d.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" @@ -112,7 +113,6 @@ void r600_fini(struct radeon_device *rdev); void r600_irq_disable(struct radeon_device *rdev); static void r600_pcie_gen2_enable(struct radeon_device *rdev); extern int evergreen_rlc_resume(struct radeon_device *rdev); -extern void rv770_set_clk_bypass_mode(struct radeon_device *rdev); /* * Indirect registers accessor diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 21f653ae1e1bb..88e29ebaad467 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -39,6 +39,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "rv770d.h" +#include "rv770.h" #define R700_PFP_UCODE_SIZE 848 #define R700_PM4_UCODE_SIZE 1360 diff --git a/drivers/gpu/drm/radeon/rv770.h b/drivers/gpu/drm/radeon/rv770.h new file mode 100644 index 0000000000000..a3f2bb44979fe --- /dev/null +++ b/drivers/gpu/drm/radeon/rv770.h @@ -0,0 +1,35 @@ +/* radeon_rv770.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 __RADEON_RV770_H__ +#define __RADEON_RV770_H__ + +struct radeon_device; + +void rv770_set_clk_bypass_mode(struct radeon_device *rdev); + +#endif /* __RADEON_RV770_H__ */ From patchwork Mon Nov 16 17:36:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324444 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503153ils; Mon, 16 Nov 2020 09:37:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHq/Mp5Unul9CqM+OROhDRGE4CP4XUgBB0XK8w9TgMOCyKE3CuEorTclm2IG0rZOQomZK2 X-Received: by 2002:a17:902:c3c9:b029:d6:7e88:cfa9 with SMTP id j9-20020a170902c3c9b02900d67e88cfa9mr13362935plj.64.1605548251838; Mon, 16 Nov 2020 09:37:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548251; cv=none; d=google.com; s=arc-20160816; b=BVKX2lA2FRrfyrnmXL34Fubn9WSqCWGjtHgRUeUBdt2UvGtvZKucqa4cUgABdY32UX +sWycGboLAabS0MMxTj5ClyQHGwgcnQ8yY/xl5DAi8sqfb/FFcLDXN2oDZ92q6FVbzW/ rgL/t4HjX5FbUixHtHubA0Z0BkHZanfdZ2+0VzSdgoKesPZxGOgX4ui9altzk4DEtpX3 D+ZUOLtmvc5yMgBN28Wj4BtCPUmgB30Ot8HckmgzWkeSh//8CoheoZvCThtkewCaUa8w R99aQQcEm8FHlccDMHK6Iuq9TA/KSertDUgG8ce6NbkkSC6NTsB4ffWOSyokas0pmX2r w7yQ== 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=xz/bv94RuQHC2TaZmj3Eh/R2FLAjIz/K+zHq/XIaatU=; b=YdEAH5GOVo8SI33vgxQA3RIUWfnZk9GjcC6mQfwyKVMQe29eETVPsFAnp+6Zi3mQ4L CKYuVaEXuYmx6+2y1fLws32/7NwC8xssoAWEi3a0+7+TFK1N+VykgvbGC0zXbIRBqvKR EQnufBJDZEQEIwoWe51Gusqbg4GwndCvxVBM2dKU9jznnPWezUMobU+Ni3asS8T+jMX/ zyyazHgKSJV0VSvT0atZjTbSCl92ob/UjwCpVKv8n2VpoV/PMrAfxGYpNEVypsgQ0NtY yNJHKo47uNaNfMtjge/4f+xXvKatqnTVf5IxStpky+mdbKd4bfOKtvCQz56UA47ORCdr luqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ut8jxO1l; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id fa24si30718pjb.15.2020.11.16.09.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ut8jxO1l; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 DDE1D6E03B; Mon, 16 Nov 2020 17:37:27 +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 791E06E060 for ; Mon, 16 Nov 2020 17:37:19 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id k2so19677910wrx.2 for ; Mon, 16 Nov 2020 09:37:19 -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=ZUOfHDa8VKjKfvaDOIZ0lG7+TRmewMW6pKq0nq4Yf40=; b=ut8jxO1lAmNq7OzJ9R4sz0vJdyrWQMXwL0AD6ih0EUtENjbT02f+txcqG8JOqBTl3G y8DyBeyPhhRECA9RCvjs4fvoaJ8rikWI8AKq0WhKNu4bFRC/xeyjdEMsORqjufwFFK82 O4ZF7LtxJ/AOhxvXXu0e4DCqSSxUbH13n4bil2XlmGi2/fGURIoBCpx4Wbfq0Xh04L3b A3xYKjycgkl/XqpmhTHokEo4RtdlampZs0ZzrbVb36g/PSvC5p57RNjdkbjU1+kVsSkY yhaEPK+mpcZO8E+qjDbR8BUK3bXeBNtVCXID4/wbENNRoQeZ+MLf06BPQ72PlLc8BSFg cQJQ== 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=ZUOfHDa8VKjKfvaDOIZ0lG7+TRmewMW6pKq0nq4Yf40=; b=evZZQ8DyNWk97awnZij82BYXTjSQgnRMF3thnGtz1TZqVgpw9nbrqxiIOU0/t/KGoj lB/YryZYME9AGmr49O1dq4E/tBDU8OP1rFMuz8sexxcRUAotDxvs6s3jbh5FGsXHxnB3 hMKTa1HwTRNW+t518QncEFHg9YyHsijNrPc8ozug1rS7KIn0YhsnNs1rlNTwx7M/QFtt WY0z6K0PrMwunsnXT1DXWHdH50ow65CMC+C+d997XViPn3NtQUXfAW5Q3n1jhSJDZlk5 Ty8t8hAF0sb0ncltJcomenLzLE+j4S4MIbemctiZXiiySb9xE7T8evaFOOY8uhfCxfwl oEng== X-Gm-Message-State: AOAM530SB4quHPnklftPSSI8ZPfD4ue0g0aD//TO1cJZFqFxDbMkuk4N QKnkTKO/SCQfFvgQIxqwuXJVqA== X-Received: by 2002:a5d:40cd:: with SMTP id b13mr20432633wrq.52.1605548238161; Mon, 16 Nov 2020 09:37:18 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:17 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 10/43] drm/radeon/radeon_pm: Move 'radeon_pm_acpi_event_handler' prototype into shared header Date: Mon, 16 Nov 2020 17:36:27 +0000 Message-Id: <20201116173700.1830487-11-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_pm.c:74:6: warning: no previous prototype for ‘radeon_pm_acpi_event_handler’ [-Wmissing-prototypes] 74 | void radeon_pm_acpi_event_handler(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_acpi.c | 3 +-- drivers/gpu/drm/radeon/radeon_pm.c | 1 + drivers/gpu/drm/radeon/radeon_pm.h | 33 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_pm.h diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c index 6cf1645e7a1a8..1baef7b493def 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c @@ -36,6 +36,7 @@ #include "atom.h" #include "radeon.h" #include "radeon_acpi.h" +#include "radeon_pm.h" #if defined(CONFIG_VGA_SWITCHEROO) bool radeon_atpx_dgpu_req_power_for_displays(void); @@ -45,8 +46,6 @@ static inline bool radeon_atpx_dgpu_req_power_for_displays(void) { return false; #define ACPI_AC_CLASS "ac_adapter" -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version; /* version */ diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 65d172b13e065..1995dad59dd09 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -33,6 +33,7 @@ #include "avivod.h" #include "r600_dpm.h" #include "radeon.h" +#include "radeon_pm.h" #define RADEON_IDLE_LOOP_MS 100 #define RADEON_RECLOCK_DELAY_MS 200 diff --git a/drivers/gpu/drm/radeon/radeon_pm.h b/drivers/gpu/drm/radeon/radeon_pm.h new file mode 100644 index 0000000000000..5ef147785e815 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_pm.h @@ -0,0 +1,33 @@ +/* radeon_pm.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 __RADEON_PM_H__ +#define __RADEON_PM_H__ + +void radeon_pm_acpi_event_handler(struct radeon_device *rdev); + +#endif /* __RADEON_PM_H__ */ From patchwork Mon Nov 16 17:36:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324446 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503223ils; Mon, 16 Nov 2020 09:37:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzxg9Z18oZtZDkgwttkUMETYpR23ofEBcL0drL09x6EcnPkeD1iDyzTzyn//i3SRXWsfLUT X-Received: by 2002:a63:8d4b:: with SMTP id z72mr243854pgd.327.1605548256637; Mon, 16 Nov 2020 09:37:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548256; cv=none; d=google.com; s=arc-20160816; b=U8zS6aX2ADOoH+gyoxzJ9TFvLYQxoHHVnUOLrmyY83+huAqIlbAXbsSX/gBZctJRuA o38Em6gvXYKEomV2XIttE6UqPJBnsw36wGtFvvGgF3q9zFPIEvZtW95KPUOmfLNbkg+i aUMCB28CY1fHd2ZwXKLJOL6UQXkIwk/3rsXSawQDvM5vfAAf13jom+hSprXzJxbjZgW2 AuIaOVtnvFBIWw94kKzXf7MUG+XxROfUE3uQ2Uiv1UMMeheThFsANSbalMu6RU2PZXKO A2omewDNXWH8O6jVok/INoVEGz7yetuHFlByCnWY/xxPsT8IMDWj0b8RNVnxJPx6Q9Mi m3Kw== 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=YDGZD85nV1bDyWUlR9fAWADxYHTaAMd/WicRGk4mXpV1obYwFu5/Aw3If9fDZachM/ UXlrboraXGCvjQ/sASuL303pSSPCp68FGmkJkgZAQqA/j24XbYRCplP9PSmQ5g9wTqz3 kUYxDCMFzgZTR7zSGALFdvep5aHS5y5OVJd8CMAXa4NxP2PxEbjQFz5gC/FEI/3mA/A2 fAMu4JT+Oj8hLT6TlpjAVewrj8qb/kA2a1sI50i/IyNaY4rQpy9ctvdYSvXkQVMYDOw9 j2HYpijgIQ/FJ/bCyUCqYmPhyEZ4lEyf4L/+5e4uGvG5aW1q/a1iQ/AwrNBXvapOrvDg GA8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=lPZeyl6u; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id j62si4531810pfd.271.2020.11.16.09.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=lPZeyl6u; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 D1EEF6E062; Mon, 16 Nov 2020 17:37:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id D3D006E063 for ; Mon, 16 Nov 2020 17:37:20 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id j7so19631687wrp.3 for ; Mon, 16 Nov 2020 09:37:20 -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=lPZeyl6uWi7xUQZkvOEt0UCMHVHP8990HNpdrvYMl0WHli7nvkcSvo+7bls/hlxqxT qkgThfDFvUQ8SDqwIBkFEpuHOEUhvXzbRixLcrE6I/elSkxeC++BarR6XIfDpg4pP3nO hBBh/5d2rUqef+FimPU5R7CTZX4OQkk3lHX4MsxeBA35z++/uBsA+Aa+Oa/wq+5pegqd sULjOoyhyBSnknx+UyluYSKwpT/FBRQQaZ3zOcZlWnwPD3jNlj9ld2R1xSnL1WnvLBtV b5eCsQaKfT6kCOCWgevMTEGEoRlmqmiOsnnsbzQ9jM2y2bwesu31jcvq8mlUqPxjw0os BdKA== 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=szdFXOZN8F9lo4ePxxUS1eiOjt6Upo8NXvgJxP29fzs6u08juZxZv0qCrHHEf5bWE/ LtLatjYbIGsJbydMn5YM7GIhME1LuW9Z6vteIVQZTyK6bX3fwys53R1xrEINiiZ/decf DAQqABIfPpv16HlN3pe7mRcAfxfO5CDGLm8t/POr6ygpQxf3H7m/gLGTVttvHduOKZDC i0v56QhVzPFNJxeIok793tmigIP+ilRE5k6uQ9N40Psf80AFmjaFya7oAc8jZSe+U02G WP/MQ0ipyzMZWwAJbxRu3Qc8VBIbU+To9ElmIp86r29wwP3jJodbPknbSC01U5z9lENT aOXw== X-Gm-Message-State: AOAM5318I/vXXhJuxn1nZXoGfOXa6Iv0FIfmjDDQkrIgTUe/zIbJWI3W KsjX32g99AYQLyalND0s9bpZR3jQsmNnnrS1 X-Received: by 2002:a5d:4001:: with SMTP id n1mr13254833wrp.176.1605548239475; Mon, 16 Nov 2020 09:37:19 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:18 -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:36:28 +0000 Message-Id: <20201116173700.1830487-12-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 , 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 From patchwork Mon Nov 16 17:36:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324449 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503280ils; Mon, 16 Nov 2020 09:37:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdogJR8dK6tRfDXY+yhFuH1WcUsQRXat1g+IPGnt8T5DwHML0XaRWjXNTZHi1Lko9eJasL X-Received: by 2002:a63:2ec7:: with SMTP id u190mr270655pgu.21.1605548261097; Mon, 16 Nov 2020 09:37:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548261; cv=none; d=google.com; s=arc-20160816; b=nUDo4+uhGe19ru/1odMn77rZw6KLCESkqmaplmNcTJ2xmznwJiVLwBluSdteYrVotS q99hgGK0AZ+VKCKVbFlKAz6EubsD06ucMwJ7cslxZWdI06k1fykiPAHjysz65elx+/QU 2E79lJHbeHCX1IHgmDv9iT2yE9Jg2owXeUcaMyttcdUMOluaN0yRFbTBGEdtBvfmrFmm /ChHOnhfJj9kt5zGayWCQT6jDdpQAHdr0vQfPGhW/1i9cEFhsELf1Yqrgvnv2TxAzTov krvDiJVvh0YtsPnj1hv6KFbEGRel14JorBWtpG1zQopQ/lxb6eEB/ZzwLFo/VbOjv5ny iDyw== 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=4TcJh/YX6BXhLMOaykAZupdve52+gsSkXKdwem8q5QU=; b=akBun+BCoCUezndCJhEW8/nh6Gs7Iq2D/sD93wAGeViYEqJY+d9G1/qxpD++h+7jva H1kSrmhQEcIatPlAGHu4L2eyUFWYOdtKYSEvQ9927yOJhXQZteZw5wzFvmCGfQtE4KAZ 6/6MYlMJd/2a/jB7d6VEtK1IwczcwP4Bem5EePg1Eju7wgHTuIKTMmViU7elqnaczJ9d V7mReLoH+Rrce1i5ANuZ7vYKZY1stEikJZCRFz65xGGg3h3/O0h8e7OcrdnowuYybEx5 n7rAFrssNnzizBqumIOsfI4MwcktxKQrfk5Ve719fuv/RWLo6vTBumUVV0tH7kzb1/1l 0QjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=xwaRqeZ7; 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 n193si16472083pfd.160.2020.11.16.09.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:41 -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=xwaRqeZ7; 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 286FB6E055; Mon, 16 Nov 2020 17:37:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E3A26E03B for ; Mon, 16 Nov 2020 17:37:22 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id a65so31042wme.1 for ; Mon, 16 Nov 2020 09:37:22 -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=I1uDD7eJYKIFmY2+cEE1XxDSSI80DfvhehKV0mcsFfw=; b=xwaRqeZ7quP0cWyeWhd8C6+hJKr/nYyRBXd5dcd/0xopFhUsnodBso0oGf7oip4HT5 CWT6wdh+uJgJBqvi0EEYxPVdELNx/M2yGoG2KAEoeMLoE9LJFe1WUqpcQY8KLAkNaGN8 SvB25e7lNzQ7Q0xQjnrx8YVp1hUbanOFrVvrIBSZi8RCgwbIhHf8fgiLGGTjo7XiQu39 6JxMmkENBQ/YeBPOMpvs+pK9pkDuHh+7tIk9gQ/zKXB1bz8LH3BQ1eILp4X29krtQeee axdAUn7R6YssKyyop9XTX1yvlvTSl8KCMnSgrwEMFrsG/3LPLQdvF/27Wp58nwphtKPG ZeNA== 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=I1uDD7eJYKIFmY2+cEE1XxDSSI80DfvhehKV0mcsFfw=; b=qQepw2M/8WISiYBysq5wzntVgwZxqH7cBPUvWJIUmAq5Z+/BNxfrmnm2/RAlgpl4Cm GwfbEw4RF2ieAR93p8BnPotBtOgzbsXGSo80muqF0HEn6O66RB2QRNsWC5csc+zDprC+ YUkvpiBGj2oYGrhScRi6SLxnYfWLbwCbHau/hMTOOPCg8VUTrUx0OT52Q4HYAy70/CdO 6EoBrNxeO561lEH9jCPLKvd4lET0E4AxqMavk4MeUbTu2iy6B7ou7ohs9idFeLleQHDc 2NZOcEVOMoLpENZ5FAT2FHjZrsJ4mPviHwMg744Y5Dvxctx+C8vhAUYWR/zUXaJFcLBC qUQQ== X-Gm-Message-State: AOAM531WpiCNg/nwYNnjL/bEvxK7UefEUq4wCpVmplwHGyElLqUoJybR xg1hLMsx/J4+356A8FkidHVvXA== X-Received: by 2002:a1c:b0c4:: with SMTP id z187mr16320374wme.113.1605548240726; Mon, 16 Nov 2020 09:37:20 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:20 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 12/43] drm/radeon/evergreen: Move 'evergreen_*' and 'sumo_*' prototypes out to shared location Date: Mon, 16 Nov 2020 17:36:29 +0000 Message-Id: <20201116173700.1830487-13-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/evergreen.c:1281:6: warning: no previous prototype for ‘evergreen_fix_pci_max_read_req_size’ [-Wmissing-prototypes] 1281 | void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:2664:6: warning: no previous prototype for ‘evergreen_mc_stop’ [-Wmissing-prototypes] 2664 | void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save) | ^~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:2762:6: warning: no previous prototype for ‘evergreen_mc_resume’ [-Wmissing-prototypes] 2762 | void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save) | ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:2850:6: warning: no previous prototype for ‘evergreen_mc_program’ [-Wmissing-prototypes] 2850 | void evergreen_mc_program(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:3710:5: warning: no previous prototype for ‘evergreen_mc_init’ [-Wmissing-prototypes] 3710 | int evergreen_mc_init(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:3769:6: warning: no previous prototype for ‘evergreen_print_gpu_status_regs’ [-Wmissing-prototypes] 3769 | void evergreen_print_gpu_status_regs(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:3797:6: warning: no previous prototype for ‘evergreen_is_display_hung’ [-Wmissing-prototypes] 3797 | bool evergreen_is_display_hung(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:4009:6: warning: no previous prototype for ‘evergreen_gpu_pci_config_reset’ [-Wmissing-prototypes] 4009 | void evergreen_gpu_pci_config_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:4110:6: warning: no previous prototype for ‘sumo_rlc_fini’ [-Wmissing-prototypes] 4110 | void sumo_rlc_fini(struct radeon_device *rdev) | ^~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:4153:5: warning: no previous prototype for ‘sumo_rlc_init’ [-Wmissing-prototypes] 4153 | int sumo_rlc_init(struct radeon_device *rdev) | ^~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:4381:5: warning: no previous prototype for ‘evergreen_rlc_resume’ [-Wmissing-prototypes] 4381 | int evergreen_rlc_resume(struct radeon_device *rdev) | ^~~~~~~~~~~~~ drivers/gpu/drm/radeon/evergreen.c:4670:6: warning: no previous prototype for ‘evergreen_irq_suspend’ [-Wmissing-prototypes] 4670 | void evergreen_irq_suspend(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~ NB: Lots more of these - snipped for brevity 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/cik.c | 6 +--- drivers/gpu/drm/radeon/evergreen.c | 1 + drivers/gpu/drm/radeon/evergreen.h | 51 ++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/ni.c | 16 +--------- drivers/gpu/drm/radeon/si.c | 7 +--- 5 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 drivers/gpu/drm/radeon/evergreen.h diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index abf370e16bd9f..315c4f3df3656 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -30,6 +30,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "cik_blit_shaders.h" #include "cikd.h" #include "clearstate_ci.h" @@ -126,11 +127,6 @@ MODULE_FIRMWARE("radeon/mullins_sdma.bin"); extern int r600_ih_ring_alloc(struct radeon_device *rdev); extern void r600_ih_ring_fini(struct radeon_device *rdev); -extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save); -extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save); -extern bool evergreen_is_display_hung(struct radeon_device *rdev); -extern void sumo_rlc_fini(struct radeon_device *rdev); -extern int sumo_rlc_init(struct radeon_device *rdev); extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); extern void si_rlc_reset(struct radeon_device *rdev); extern void si_init_uvd_internal_cg(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 9a1e240b07234..f860f5ef2df88 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -32,6 +32,7 @@ #include "atom.h" #include "avivod.h" #include "rv770.h" +#include "evergreen.h" #include "evergreen_blit_shaders.h" #include "evergreen_reg.h" #include "evergreend.h" diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h new file mode 100644 index 0000000000000..30c9ca99ced90 --- /dev/null +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -0,0 +1,51 @@ +/* radeon_evergreen.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 __RADEON_EVERGREEN_H__ +#define __RADEON_EVERGREEN_H__ + +struct evergreen_mc_save; +struct radeon_device; + +bool evergreen_is_display_hung(struct radeon_device *rdev); +void evergreen_print_gpu_status_regs(struct radeon_device *rdev); +void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save); +void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save); +int evergreen_mc_wait_for_idle(struct radeon_device *rdev); +void evergreen_mc_program(struct radeon_device *rdev); +void evergreen_irq_suspend(struct radeon_device *rdev); +int evergreen_mc_init(struct radeon_device *rdev); +void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev); +void evergreen_pcie_gen2_enable(struct radeon_device *rdev); +void evergreen_program_aspm(struct radeon_device *rdev); +void sumo_rlc_fini(struct radeon_device *rdev); +int sumo_rlc_init(struct radeon_device *rdev); +void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); +u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); +void evergreen_print_gpu_status_regs(struct radeon_device *rdev); + +#endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 564a775b4b90c..1c9030a4631b8 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -32,6 +32,7 @@ #include "atom.h" #include "cayman_blit_shaders.h" #include "clearstate_cayman.h" +#include "evergreen.h" #include "ni_reg.h" #include "nid.h" #include "radeon.h" @@ -190,21 +191,6 @@ static const u32 tn_rlc_save_restore_register_list[] = 0x802c, }; -extern bool evergreen_is_display_hung(struct radeon_device *rdev); -extern void evergreen_print_gpu_status_regs(struct radeon_device *rdev); -extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save); -extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save); -extern int evergreen_mc_wait_for_idle(struct radeon_device *rdev); -extern void evergreen_mc_program(struct radeon_device *rdev); -extern void evergreen_irq_suspend(struct radeon_device *rdev); -extern int evergreen_mc_init(struct radeon_device *rdev); -extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev); -extern void evergreen_pcie_gen2_enable(struct radeon_device *rdev); -extern void evergreen_program_aspm(struct radeon_device *rdev); -extern void sumo_rlc_fini(struct radeon_device *rdev); -extern int sumo_rlc_init(struct radeon_device *rdev); -extern void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); - /* Firmware Names */ MODULE_FIRMWARE("radeon/BARTS_pfp.bin"); MODULE_FIRMWARE("radeon/BARTS_me.bin"); diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index de0792842af89..45076c27d7ded 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -32,6 +32,7 @@ #include "atom.h" #include "clearstate_si.h" +#include "evergreen.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" @@ -129,12 +130,6 @@ extern void sumo_rlc_fini(struct radeon_device *rdev); extern int sumo_rlc_init(struct radeon_device *rdev); extern int r600_ih_ring_alloc(struct radeon_device *rdev); extern void r600_ih_ring_fini(struct radeon_device *rdev); -extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev); -extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save); -extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save); -extern u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); -extern void evergreen_print_gpu_status_regs(struct radeon_device *rdev); -extern bool evergreen_is_display_hung(struct radeon_device *rdev); static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, bool enable); static void si_init_pg(struct radeon_device *rdev); From patchwork Mon Nov 16 17:36:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324450 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503302ils; Mon, 16 Nov 2020 09:37:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUVgLpc3FGrow/HeL17plAzsJ7hrf4pgEqDubqvAETuJJSqDeU8+xeS37Aez67a2JK+pvB X-Received: by 2002:aa7:868d:0:b029:18a:ea7b:342f with SMTP id d13-20020aa7868d0000b029018aea7b342fmr15195949pfo.68.1605548262932; Mon, 16 Nov 2020 09:37:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548262; cv=none; d=google.com; s=arc-20160816; b=XGR1383NCbZY+3m3kknh7eCtgOl+YipMcBWOakKoT6iu0Y/fb/VTQ/SPvCi2WwpE/5 74h4pVyWFLADwNn6pdLlYFzCTNXTmP7XMU6JRescTa+N6aeJn552OPpHDcAOQMEU6qGE UcNNaBovGvumvClWl2dESd2TVJcxziaDcQ8KP8rBRShUeM1aH55Ea8hG7BbJYA93PAa/ u1ge/TwOmaQiyZka3iW0gA6q/WZfwvTO5IJ2AMRyw3wdvVRL6zoZ3Ss8svclgFv8PJ1i JGVLBBmwOrZnPosUb0mdVoe0yimRcqcB8GNADwTFf7G12en/GBhHBJ760FWV/1vfUFT4 zvmg== 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=OJv5AiZH+s8nAE1tQPur3igOsR+M7q5t+IXz4aDhvKs=; b=gE9jp6x0mHGClXCyj28mAtyNoElohkUSemTlbpBKWMJNOwsYqhsj3a/B+WQHJIubSc GDvRNuhDFWErLlCdsy/yv5LzF+V1B45lf79off2HE2ZWrkmsByX3pxBrkB8X1mWo5gH2 s1Z5apcMfxTy0njviEqM+PWtXxFnBkq7GazM38DxK4G3VY9XHdvnnzp5csUjaJzLkv12 4t1VnN1pRkVHgCgMz7D7cqldjA2tkhwKDQpPzEmkLlol5BhczkDVmfwTi09DCDDqzxzj tznZjevr5bi1woZ5Pkz0X3Lj1PwY0vw9PRJ1MLGd5hISdCMk+8LO2G5qAGTlwNP9LJHB OPkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=V+ElGLhI; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id c201si16178249pfc.257.2020.11.16.09.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=V+ElGLhI; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 352386E08A; Mon, 16 Nov 2020 17:37:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 651756E06D for ; Mon, 16 Nov 2020 17:37:23 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id w24so37164wmi.0 for ; Mon, 16 Nov 2020 09:37:23 -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=BSn+OXUyqlvsEb5g4HG7YJio2FrFxnG4RAzoSpJ37n4=; b=V+ElGLhIkl31Mb6P/M3XGUqM6iyTGUDvmxvcJhvSe07Njk+hFpmjbacneoTsjLTfSA sFaHyOduil4Gvo0/pfIxP9JJGg9xIs4lJ6PC/K/1BjS5gzfuKAtS4dA3U/06gExWEepW z34W2YW39i60AK8MaVWa5tWhHqmxnSpDAcSwTB7TvxuMDO1A6bNFQdF9k66dM1xEHqv7 +U3CyMQ83XgpjYOueCkvHHKJV8TuCuYa8gCaCPC1qX1Ro21fGH6DH24sQ4vz9p4c35qp vypuRQj7FtZdT32r2KCrzyTF4ZPSx0btFEs2MYm25/t3tW94aqCkVKeabvJsqDXn9AJW ULeg== 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=BSn+OXUyqlvsEb5g4HG7YJio2FrFxnG4RAzoSpJ37n4=; b=IdO1cJbJ62ToDV+cIMvZ48T6l0xmTlTR6wmGf0OxyrMFD5DDmip3fhA6k2/2M0mxtA +v69+moR+3BwaygEeTPpc20BFOudhODdihp9MZ3lb7BgyQd3RBUCupYQ8RP5kHra4lhA nJfqfYjDhej1eO0CHHG77jT6DPVdBJ+APPSYTbzcBGI6/77f4JKgl2RA+7xvIpZrS8vA JvLbrpA1axi6WTBfphPaHH8Sg06LRbV+0NRvEcmH8XHfLS6UPSEKsfXPrH/ekCv4GMHz heB4LWG1Fj4TVOzQOo6MnArZ/OKr+w7BE+kRZ8xFfIuSSPjcXOaZhzU05GQEJFHcft8L It9Q== X-Gm-Message-State: AOAM531qfi7xB/gyP8Ti7hxoq4Qi/LHOM7PHJJviQFo3O7iEwiNHr9lk Pe94w+mlGPDiPIHdqoKxPqMJpA== X-Received: by 2002:a1c:2b05:: with SMTP id r5mr16513667wmr.179.1605548242110; Mon, 16 Nov 2020 09:37:22 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:21 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 13/43] drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:30 +0000 Message-Id: <20201116173700.1830487-14-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 , Gareth Hughes , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_ttm.c:931:5: warning: no previous prototype for ‘radeon_mmap’ [-Wmissing-prototypes] 931 | int radeon_mmap(struct file *filp, struct vm_area_struct *vma) | ^~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Gareth Hughes Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 536b246b9a6aa..2b9deaead99b2 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -51,6 +51,7 @@ #include #include "radeon_drv.h" +#include "radeon_ttm.h" #include "radeon.h" #include "radeon_device.h" @@ -125,7 +126,6 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc, ktime_t *stime, ktime_t *etime, const struct drm_display_mode *mode); extern bool radeon_is_px(struct drm_device *dev); -int radeon_mmap(struct file *filp, struct vm_area_struct *vma); int radeon_mode_dumb_mmap(struct drm_file *filp, struct drm_device *dev, uint32_t handle, uint64_t *offset_p); diff --git a/drivers/gpu/drm/radeon/radeon_ttm.h b/drivers/gpu/drm/radeon/radeon_ttm.h index 91ea7141bc812..4d7b90ee27740 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.h +++ b/drivers/gpu/drm/radeon/radeon_ttm.h @@ -32,5 +32,6 @@ struct radeon_device; int radeon_ttm_init(struct radeon_device *rdev); void radeon_ttm_fini(struct radeon_device *rdev); +int radeon_mmap(struct file *filp, struct vm_area_struct *vma); #endif /* __RADEON_TTM_H__ */ From patchwork Mon Nov 16 17:36:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324447 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503239ils; Mon, 16 Nov 2020 09:37:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2wekOvglIdP8MaH/neK9MCXYyCpdV90hGzTaCBHgjxxD0uAXuXigvQ4W4F8evfhYaWp0/ X-Received: by 2002:a17:902:a404:b029:d6:ebe0:6e57 with SMTP id p4-20020a170902a404b02900d6ebe06e57mr13933412plq.12.1605548258103; Mon, 16 Nov 2020 09:37:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548258; cv=none; d=google.com; s=arc-20160816; b=FcO5X+O7lbgdlMwpGta4ld9xeN2/3Qwijdnj8nCpcO1xiwH9Ar/+gVxA6U07tnohHF xRy3IS7nMJy2mRjUSASbVKFT2tK5HW7GfleQukzyH/OWs6wtttw8GJIKp8H9saKDEa0J G4RcomhplYpALs3wFKqvLzsj9Wn1/lPLo0DKIR8/1QuVlsY4BayS1zTlZ2CGTPgDiKji 165ksXo+UOXwpz/VklUgSGW71PjHdt+m53Qsik/A7/uVDoVRbhKMtk5V35MmPjI2ENej fxlqrh3pm0yj/4wu8h19SNQxtrHjLnGFyceblVkU17Ealwl+01HdXpMQX0Lqb4mTbo0c Bm2A== 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=vcd9Fg0dGY4X4aj26aOnXyi3le1MKBQA1WyS2UlwkE8=; b=cD1ak3prCoS2NdJMn1AQVyZJhEzou2cVzrkqMRDPfOndriOU7RpmDe1NbfZ7kY51RO GIjZnZmcCwRHvDteBXplmMVgRYJwsOFBKD4IEbCGDITe15XoRBsKHW/bFnRIqVph97s3 3blEDm9mEEi9umQaXsL1aliBzp8Q/wfvnwLSlgKwuOrRsH9Fem+OKXfQ+bpj9LKEiHbo KW2ltupK8EzSrqnBvY0wzmJKFRQQ7HN5/pq4HhWz+01U7eaiGbKrZJT2f0+y8nFpk+Es MyTruY4SzxXf1MB/cjuIKmrwQoLiBtz/GtP3JnB4XNWNbS9lPzpi9z0lGGkWBIv7fssU D+6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CmPxnfrb; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id g15si5427pju.120.2020.11.16.09.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CmPxnfrb; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 DF64F6E054; Mon, 16 Nov 2020 17:37:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F9536E04E for ; Mon, 16 Nov 2020 17:37:24 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id s13so15698wmh.4 for ; Mon, 16 Nov 2020 09:37: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=LOhlVom8ArIcUSlzkbPekEoXplId4I2upAMKLydb2GM=; b=CmPxnfrb0iveHS+EM+94RdsbI4La2NMSex8aL0XxYO+VsmiHxb1T/B0NVOroiN4eNy znBmDRIvsBXEblbIonPmhP54WgoTytMUlbfC+xD/LJkUwRKBoi5dfGThNDnjMMn1GPZQ HURBVacMhPpsqtVDiGkQdoi8T9Hvgq0fwOQyAVwuw7HQ1SQao+jOshpXOjMsm9DX+Jlo RBt20P0RIfkJ+fsKhkZNswBsAgph2o0G2IjIaLW5x+5Z0yIeauoJsnQIBu/uClSaKxod euCSaxmgg0cNnMcDKWUevDeoTsfpdsYbqv6Mrdxk8hn0lbFaeOjLcxwg/65wZ2ZVl5ti k8ww== 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=LOhlVom8ArIcUSlzkbPekEoXplId4I2upAMKLydb2GM=; b=P3Led8o4Pjag9tNhMReiaVfw5KN0YZXwpJMCpQKtfnFk+xq1/baorxqzmesh/eY8RK A1T/Vi65f6kDI0ECWOSafxunOU/LMqrULp7FAXOP6rl8i6vd97OvDu/wCgzKGOFTkYYO 7Jv1CZtngvSRqFeRZ9zn0Cll8nrWqGXd6yFkphZ135KK6IFwOLewoEnTNgKGwHnEUL4i aI6r8ewzLEXxAVfZrw5bosdk0hRGC7DEePwRghm6nKr5LECeiezkuNlDXxw1TsHNWS9e VhE7M3uNLaszoI+UmnQwvg8BNSdweUNWxVRCa1MqFQzeQEBDHXGHf/DmWi1X1/sqlWDh rjwA== X-Gm-Message-State: AOAM533d5yeZy+utD41zv+fXuymS+qABWmac2B8gjcgeOqkNCsYIAIfE CY+p+XOd2ADB3jhOQ6JZ7gnxgQ== X-Received: by 2002:a1c:bcc1:: with SMTP id m184mr5069wmf.132.1605548243272; Mon, 16 Nov 2020 09:37:23 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:22 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 14/43] drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into shared header Date: Mon, 16 Nov 2020 17:36:31 +0000 Message-Id: <20201116173700.1830487-15-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 , Gareth Hughes , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_irq_kms.c:53:13: warning: no previous prototype for ‘radeon_driver_irq_handler_kms’ [-Wmissing-prototypes] 53 | irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_irq_kms.c:120:6: warning: no previous prototype for ‘radeon_driver_irq_preinstall_kms’ [-Wmissing-prototypes] 120 | void radeon_driver_irq_preinstall_kms(struct drm_device *dev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_irq_kms.c:152:5: warning: no previous prototype for ‘radeon_driver_irq_postinstall_kms’ [-Wmissing-prototypes] 152 | int radeon_driver_irq_postinstall_kms(struct drm_device *dev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_irq_kms.c:171:6: warning: no previous prototype for ‘radeon_driver_irq_uninstall_kms’ [-Wmissing-prototypes] 171 | void radeon_driver_irq_uninstall_kms(struct drm_device *dev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Gareth Hughes Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_drv.c | 5 +---- drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 + drivers/gpu/drm/radeon/radeon_kms.h | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 2b9deaead99b2..211932d73b191 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -51,6 +51,7 @@ #include #include "radeon_drv.h" +#include "radeon_kms.h" #include "radeon_ttm.h" #include "radeon.h" #include "radeon_device.h" @@ -117,10 +118,6 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon, bool freeze); int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon); -void radeon_driver_irq_preinstall_kms(struct drm_device *dev); -int radeon_driver_irq_postinstall_kms(struct drm_device *dev); -void radeon_driver_irq_uninstall_kms(struct drm_device *dev); -irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg); extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc, unsigned int flags, int *vpos, int *hpos, ktime_t *stime, ktime_t *etime, diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index a242b6053d47e..b8b7f627f0a9c 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -38,6 +38,7 @@ #include "atom.h" #include "radeon.h" +#include "radeon_kms.h" #include "radeon_reg.h" diff --git a/drivers/gpu/drm/radeon/radeon_kms.h b/drivers/gpu/drm/radeon/radeon_kms.h index 36e73cea92154..913c8239d5d8d 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.h +++ b/drivers/gpu/drm/radeon/radeon_kms.h @@ -32,4 +32,9 @@ u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc); int radeon_enable_vblank_kms(struct drm_crtc *crtc); void radeon_disable_vblank_kms(struct drm_crtc *crtc); +irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg); +void radeon_driver_irq_preinstall_kms(struct drm_device *dev); +int radeon_driver_irq_postinstall_kms(struct drm_device *dev); +void radeon_driver_irq_uninstall_kms(struct drm_device *dev); + #endif /* __RADEON_KMS_H__ */ From patchwork Mon Nov 16 17:36:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324448 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503263ils; Mon, 16 Nov 2020 09:37:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTq+eYUglm5fN4tPzcPdHShrcvBBMBY/5qQWqwZHcEQhdm5JESxJouJDq5YKb9rPtkYL+W X-Received: by 2002:a17:90a:e391:: with SMTP id b17mr16984367pjz.209.1605548259691; Mon, 16 Nov 2020 09:37:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548259; cv=none; d=google.com; s=arc-20160816; b=LK0EI2Fuhe4t685zxgbpejkxb+JeTa7NCcXvhl84ZwPgsPL/C6qbx9bQrMGhtQ1ksW 4PirDIhRxLhI6g3/5n8XaVTrY3nmgJD7LUyBy/vBDt3Fm2T5Xcq4fUdQbnoIKQh5X3LM Qm8NcCDCc9azKQK2LefSqkTdBj3ZdajmQXzwia89ScqNHVCapt8Gg2AZURandx0g7QB3 H+WG1/CkyXZX7qClBiUZxAFOAymzEYcmxyul+kJ6MO0VdciTAA+4zXZ6cRihiEPDkvoJ iq563wg08aK/y7a90x5OwOp+eZhGgvdHIOXfW8+gAPCSLrEU0mb0Fw5xA1dITuRrxsq1 qtsw== 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=G1OvbfYO4TN9Ef09FcjTikmTE+wreKU80LThG1ANuBA=; b=zx7RG28Fd1J2UtBwg2cKNUtgJNIBb2AswqnnB5+aSGZB8Wk1PQDSHPPgVRhCiblxC7 JotUXEWlynK7y1OLmnx+RDTHAS6VFJX/JLxpwZ0k8mTt8wxv57Vp3bm+37j541rcIP+d S0aSaZSymHx6Lp450tzuHMJqWQ3bJMvCIqw7zuHlAcsy6173zuuaN+dR7RgEqwi++XaP ntfOskmcmsqiBwG80YSsbKwrTM9KBr79rbj0SVWUa2jWaVSelKgbsvyTZsJ+Iyro18x+ aOH1vyiBcVg7lWitXJehlg3VdtNsYt1czb6Wn77/PlzQ85Gp1bKdDLTnqWOzGTul+y3d lDHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BnwVbJwR; 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 i21si16778629pfu.115.2020.11.16.09.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:39 -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=BnwVbJwR; 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 27FED6E04B; Mon, 16 Nov 2020 17:37:29 +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 EB9A86E03B for ; Mon, 16 Nov 2020 17:37:25 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id b6so19643313wrt.4 for ; Mon, 16 Nov 2020 09:37:25 -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=y2n5EAuxxaWf0Dm92MV4U7zHBQN4uYE06MkP3Ik/k8Q=; b=BnwVbJwRHIrWiSelgE8VUORGPDGET5j5wYZz3HQcFJYdlMvspKOuspFebmEah8Hjz6 gr31bK0POXAE4z3LwjHafVrjp8+fYHxVWnm2p9z34efZ830IGvN9jlKtUbJcGYdha7En xZXaENA81gYhIFOEhMERcLgH3znBEyebE00yYVb1zJ6NnnNzRoWmik/7PBmcPfB1TaGn 8j+nSptwK8yJ904NRY4L9MeSNKIm0mEVS8vfrkxgDP6BDDczdt9JbFF4myk3nh9Rh79S H+8NNQZYtlq81stY+zFgFh3rmhvPAnYDZ93qgC1jbZDxICbEWjNQbSlwg0FLj0ak9QwW iK5Q== 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=y2n5EAuxxaWf0Dm92MV4U7zHBQN4uYE06MkP3Ik/k8Q=; b=YpQsz8QR89mbF1f5cD2Hpr80ru9mNWLqXVhGVBDqv5MePn01XRO3UlrWkYKVJte5iJ lWAgZWWGkiwAFSX5Tu99sfT1T6L4Vq2lTuInn/8i8ZR7qIx6S2t8HR9PXBdVsDdZHro5 Pswxhu32p2XZdtAAETCcVCySTMFzrWOGq7PNWnkMUZJL2y+hMLxL/I4o0mAAxFFsTm8a O5m4UJIktaOQY/NXUoJzGg0Xq1ALbJDfPcwx9W2rB+844MHf19kbe8u0BAbnOJGINjqO kCMhWR9JsnwO2bMdjX0Bpbyf3l7QYThd1VJeXUrvSTicYqg+jZtgDRr08WkPJcO1VZis 5LSg== X-Gm-Message-State: AOAM533zvmdrSjfcUDnhD3HbJGaPTcKOd8B01YfNIP3Unb1KZZFjXyu0 baCrnUK6z99w4S0fgnDYlI61zFyE3D5jFwYJ X-Received: by 2002:a5d:6892:: with SMTP id h18mr20526445wru.49.1605548244607; Mon, 16 Nov 2020 09:37:24 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:24 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 15/43] drm/radeon/atom: Move 'radeon_atom_hw_i2c_*()'s prototypes into shared header Date: Mon, 16 Nov 2020 17:36:32 +0000 Message-Id: <20201116173700.1830487-16-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/atombios_i2c.c:100:5: warning: no previous prototype for ‘radeon_atom_hw_i2c_xfer’ [-Wmissing-prototypes] 100 | int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap, | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/atombios_i2c.c:150:5: warning: no previous prototype for ‘radeon_atom_hw_i2c_func’ [-Wmissing-prototypes] 150 | u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap) | ^~~~~~~~~~~~~~~~~~~~~~~ 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/atom.h | 7 +++++++ drivers/gpu/drm/radeon/radeon_i2c.c | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h index 1bf06c91cd959..5de0563b63d2e 100644 --- a/drivers/gpu/drm/radeon/atom.h +++ b/drivers/gpu/drm/radeon/atom.h @@ -154,6 +154,13 @@ bool atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size, bool atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t *frev, uint8_t *crev); int atom_allocate_fb_scratch(struct atom_context *ctx); + +struct i2c_msg; +struct i2c_adapter; +int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg *msgs, int num); +u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap); + #include "atom-types.h" #include "atombios.h" #include "ObjectID.h" diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index aa61b3cb4049c..e543d993f73ee 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c @@ -34,10 +34,6 @@ #include "radeon.h" #include "atom.h" -extern int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap, - struct i2c_msg *msgs, int num); -extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap); - bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux) { u8 out = 0x0; From patchwork Mon Nov 16 17:36: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: 324445 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503211ils; Mon, 16 Nov 2020 09:37:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSAqy1OVU5/kI6ZiXksRe3ZvTgAOxx+5rXkasHaQR8zQnh3J8nPFQA28IEWQTKMG/rUWNP X-Received: by 2002:a62:2cc1:0:b029:18c:85f5:864b with SMTP id s184-20020a622cc10000b029018c85f5864bmr14505389pfs.29.1605548254991; Mon, 16 Nov 2020 09:37:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548254; cv=none; d=google.com; s=arc-20160816; b=epE7nc9Ewe9wboMwX0eqbZcB5H9W1hBiF26UpVE8z8thvfH4MFy/d8k+xwI4cmJLbo Ncu7B6I4z2wTflQY0FKw8l7AzhgIE9j4pT0ZGAHVxte1HyiOPsG6MbNFS/4Z2KoaTXBR Sxmj5lkP2CYyThc+TUc+1MB/6a8IHHaJdLAuxRPi54aZTU8vIfFMhXY0Dpf7reWNeN39 mB+Smj1JCSKH9F5EWsq0CuSMqRmLxOgl+5MxcWSV38ZVoP2uFuXdYOPO8rg+317Jc5Vi FvO176UZfb7/IgaXOS8eVjsDbbLjb6jXt1fmaG/3mwtxcJdNpavkUUsRe74gHZnuEfl6 aHlA== 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=MdWu6wID9JVO/0aQsG+6aY+n98NVxSDotwOHb/brB/M=; b=Rz5Ztx/ezkZDkTrVgrbTs+VdFAWzAVE7gF9jFLi/b0ZSXLWxcnXjFYihmI2T6iOMtK WrYRqxj97Y+V5UKUk/WcG9RqVJe9DqxalVMw34fhV2XGDlyfQKbe96OXK3DKhmgVPprO VlOt0eG6qt1G/VeNtSM00se3REz1/x603U+02IQk0V3gau5WPkgV8uclJ3Qbjgx8tfQZ JKrFA1eQCqNLb+UCA3iser2iTYTK2YVbgsNcORTK0/QVYAEiM6/iEynofMwuRhqFZ2Od ZTezmSnRSRpFodyzQ7UbEixt4yxAcvYtLtCdlXuXWkmBeNYiDzCGg3tlEWVmVDoa3PYd Y7dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hZVLMix1; 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 r9si14854310pgb.87.2020.11.16.09.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:34 -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=hZVLMix1; 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 55B0F6E056; Mon, 16 Nov 2020 17:37:29 +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 1D6C66E03B for ; Mon, 16 Nov 2020 17:37:27 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id 23so19606105wrc.8 for ; Mon, 16 Nov 2020 09:37:27 -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=ZB9hYDRdCmOkwqHlGjcs4P6f6PN70ruIEMJUcMVmENQ=; b=hZVLMix1qZXuOVledxd2pSvUCKHQwD1kkJJOi+0dzOiRZWtJzU6UHoOXvxWRs0/GcW yFlNWsBkdSrSq/mxr6HCuk6ZLzSLP3sSthyILxjtGJCBetdfhF9kSyv9F0CEQW7V6N1r CZBQP/LlSmmkZWzV4UOV0pCYavCl/esO2zH3MHWnY8aK8hGIE5gH8a7mE3lc0HRsZxfR f7Vkt/kyfkxpJg7u/yMSOHcb7IWtXceYip3tFAxmngjh/tsCk3Xph+1PeS1GTEXNqq3R fSySmp9Ht+PyBmgCj5THCOIIZB7U/be1M7R15riXasVAZzNzd7561n1QB16RiepLN97K dboQ== 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=ZB9hYDRdCmOkwqHlGjcs4P6f6PN70ruIEMJUcMVmENQ=; b=T9naJDOTC+Rk9DizyyDCGohPmM7iRiL5SYSNFdSDC+0A6H0Goh1rlutil/XIISloj7 Baw4Of/jMhtxiXb9JY8SyYQRwvAwtoiwi/9z25o3P5MgysXEHonn6yED4AJHthQ3Aiar vPz1ekd8ijvv9FFfcFSVJhok8jzJRehmblHe53toRpV5T2yDwWvb90ZLJr5lVMO/CybG BVo8OGPRJhzHskngv7/WLuPErSupAvXUs4EtXjYIRF7pzJFuUSCFXIZMF2nZkNbBXNa5 07wr9N6rjX/eRB5ygEK1d7Tsuk941uU/6jEL5xCxd8DYHcSqroqaHpsYABRFp4iG7bO4 9yQQ== X-Gm-Message-State: AOAM533TmQ34C+JxisXfOHxVHuozb+LiAtrUIv+aNGK6NwaS4NY7q/Z2 LXTLVjs1xMfm2nb3t03JxRvFjw== X-Received: by 2002:adf:f881:: with SMTP id u1mr21825293wrp.103.1605548245824; Mon, 16 Nov 2020 09:37:25 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:25 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 16/43] drm/radeon/radeon_gem: Move 'radeon_gem_prime_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:33 +0000 Message-Id: <20201116173700.1830487-17-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/radeon_prime.c:34:18: warning: no previous prototype for ‘radeon_gem_prime_get_sg_table’ [-Wmissing-prototypes] 34 | struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_prime.c:42:7: warning: no previous prototype for ‘radeon_gem_prime_vmap’ [-Wmissing-prototypes] 42 | void *radeon_gem_prime_vmap(struct drm_gem_object *obj) | ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_prime.c:55:6: warning: no previous prototype for ‘radeon_gem_prime_vunmap’ [-Wmissing-prototypes] 55 | void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_prime.c:62:24: warning: no previous prototype for ‘radeon_gem_prime_import_sg_table’ [-Wmissing-prototypes] 62 | struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_prime.c:86:5: warning: no previous prototype for ‘radeon_gem_prime_pin’ [-Wmissing-prototypes] 86 | int radeon_gem_prime_pin(struct drm_gem_object *obj) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_prime.c:104:6: warning: no previous prototype for ‘radeon_gem_prime_unpin’ [-Wmissing-prototypes] 104 | void radeon_gem_prime_unpin(struct drm_gem_object *obj) | ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/radeon_prime.c:120:17: warning: no previous prototype for ‘radeon_gem_prime_export’ [-Wmissing-prototypes] 120 | struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, | ^~~~~~~~~~~~~~~~~~~~~~~ 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/radeon_gem.c | 1 + drivers/gpu/drm/radeon/radeon_prime.c | 1 + drivers/gpu/drm/radeon/radeon_prime.h | 39 +++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 drivers/gpu/drm/radeon/radeon_prime.h diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index d2876ce3bc9e2..b6b21d2e72624 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -35,6 +35,7 @@ #include #include "radeon.h" +#include "radeon_prime.h" struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, int flags); diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c index 088d39a51c0d2..dd482edc819c5 100644 --- a/drivers/gpu/drm/radeon/radeon_prime.c +++ b/drivers/gpu/drm/radeon/radeon_prime.c @@ -30,6 +30,7 @@ #include #include "radeon.h" +#include "radeon_prime.h" struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj) { diff --git a/drivers/gpu/drm/radeon/radeon_prime.h b/drivers/gpu/drm/radeon/radeon_prime.h new file mode 100644 index 0000000000000..11b7f80987834 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_prime.h @@ -0,0 +1,39 @@ +/* radeon_prime.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 __RADEON_PRIME_H__ +#define __RADEON_PRIME_H__ + +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, + int flags); +struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj); +int radeon_gem_prime_pin(struct drm_gem_object *obj); +void radeon_gem_prime_unpin(struct drm_gem_object *obj); +void *radeon_gem_prime_vmap(struct drm_gem_object *obj); +void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); + +#endif /* __RADEON_PRIME_H__ */ From patchwork Mon Nov 16 17:36:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324452 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503338ils; Mon, 16 Nov 2020 09:37:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzO6AxJJj8AOLrfij4wUcaYHGSSRRhiQV5biSgvsWhp7c39/vQtA0AbwBko6aRVeALJdIps X-Received: by 2002:a63:1445:: with SMTP id 5mr238686pgu.357.1605548265660; Mon, 16 Nov 2020 09:37:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548265; cv=none; d=google.com; s=arc-20160816; b=CrVWZeeHBzeVN05YXBi5K0J6VjCqk9mSmVyolbPBCefISqw8SUxFYngWj8Y5hTVzz0 mdBZ9pALr7QaPiF3cbNDDCszVOCS0/+uMoxsAMYLrGOZzJfNbD6KpfRZejy2ujY8AStm aQ4CqmAbe25ox+vFMFDCIoX16hQNfUf2esxAZXVbTYxb31maNWbN57CymvW9F1dbDXvB pl4FaWrd4PzoaESPLZXKG2Xgw6NAdvfjbAdLCSdM0SvEGP5D+T5MAK+dWMaluR6srTC/ HNnwFiYicxtLveFYwvcedBw8j2ui40ZBmUWoyvmk2eXInBToB54pPD4rMuEVeB4HK7iq wmog== 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=OuN64xYTgA8lEZw1Ne2gUHVlfFuOGdvHmh834DdfTd8=; b=TF6GrkNsW/MEgfwtbv89iVaBqUUqNrn/qcpkh1bEtqBt+Wmc77Ic4LqinDPNPJxQiv kfHnHE3Otk6Irc+w+IekshfXb8O25SS7bNCris2Jj342vQpL8Nt2wEVPeHlO6jg/1Skx c+vA6l2Nuzv8922Wv5d/f13f8ZUlBI8hyThxu1qZjOh4uGEQXX/dQlhYIbJ/RenKNOc0 wRco72u1CfcVNNZieWYcK+YDC6s+D3aTSkmmRoYkea9h6OHhBu3mZTTMXpB/HNXzhGWP jAnW1fRIIgFwPTxt03/r/k56BWJrzfONHoYa99Zbhi0IKMlNA/UXNi+vsAHCByRy0aFU 7zIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=pXl4sHfM; 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 y73si16994945pgd.195.2020.11.16.09.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:45 -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=pXl4sHfM; 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 E28BC6E060; Mon, 16 Nov 2020 17:37:32 +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 567BC6E04E for ; Mon, 16 Nov 2020 17:37:28 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id b6so19643537wrt.4 for ; Mon, 16 Nov 2020 09:37:28 -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=eSXwzYYa3bheoqJKyaC1w7673tL6Q8v8SIpeWSSUs90=; b=pXl4sHfMaTKTY9Q0Zsn5yjN7hRjS/IdOzo8DPxbXOdgZOx/98qBDGLun2ASDG/w1/4 unDvFLcXrDlaDp1M9162PTpxW5DdxUsm5DSJzpbR1IcVBMgVRvNwvbw+0RJKpXIEDqRV KqpVTwjZs4/exFk99wUJWk01rrCbkTIU1bXQf/9THZKimB9UuJEooP+AaLsjDtHRKA7R qRIjZNpT+e0aWaANN0IZBWhp7bwPEwdV3UjMD+5JO1JIBGe9ora8sJaL8wEr5pC6xQcB u2nqq4Z6lzwq1yfln34quSTp7gzwBDuO8YIrfTApoTFPaxdtWk4ymweyF/4FPk6nGkcD lk/Q== 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=eSXwzYYa3bheoqJKyaC1w7673tL6Q8v8SIpeWSSUs90=; b=pE76ZfuTTmBvgm9qaVOOUtUuEPDDexPIjkxszESNYwmv/ZrdEfOguA5GVQID4ElGKN aGSw8U4ksBoIaMI6hhyEAkPTDAXXtn3BazSY0QAJD6QcmgiHEn0jcGcRxHhH522CEwH4 NDpF9JmRg/svFu7dnoOHlaa5DsUM2GW6eZDG1v0e3ZvFMmOJ6CJvU5PqI1vWcFqYACZF QrtOBqBryhHJC1ozLEvdP0XMeZ2Xp9705nkN5o1yLnpvQYm3slKeDPABeKDyT+PdaDKc rUgaTWuseX6FvwgNOiywn/57eM2cMUZtdQ98JY+XwVfmY98SUMmqml24gbFxFbq9hXZT GFLw== X-Gm-Message-State: AOAM530TmsSEqL2Tj5dU4Is1Z8+Pyt4LQ+FXMHGU5ozHoj/gXdxtZ0wr KUMDgXie3OYO8ADmX7ZkG6PrAQ== X-Received: by 2002:a05:6000:347:: with SMTP id e7mr20164454wre.35.1605548247016; Mon, 16 Nov 2020 09:37:27 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:26 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 17/43] drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI prototypes to shared header Date: Mon, 16 Nov 2020 17:36:34 +0000 Message-Id: <20201116173700.1830487-18-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/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 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/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 #include +#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 #include +#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] = { From patchwork Mon Nov 16 17:36:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324451 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503324ils; Mon, 16 Nov 2020 09:37:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqZxiCkQI0OCPPWPCjK+GTKd+V3KzVrKGW8iKNTuNFXjwG5g39TfRuq82c5s6C+U8GGstF X-Received: by 2002:a63:34c:: with SMTP id 73mr287850pgd.172.1605548264018; Mon, 16 Nov 2020 09:37:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548264; cv=none; d=google.com; s=arc-20160816; b=BZb7C83sV5btvOcblgOkMeRLDnpflH6C5jmZUDXzO0Ez85JvrglOJNUwEYrlQIEDQ/ CcLULBsA2FmlsuxHAwY2LEHOuprR8ICpD5FPxtBl10MvEihrxRguetMLSJZpQa8uIKNa ImrMda0itIUaszq827rh2D5WFT8q0W1jiTkR91l9PKnB5Fd4mMoFwx0wvPXQjDCYXFUE keMlizw8bnjGzfZPNvz5yOb9bUrBUPvmmrkTZ4rfd3JnW+HM6xnTTEsN6LcxzK2wew9P n+ReuMto1sZe68D0UxZTGmAKunsPlg5ssevG8lcszc9B+L6HeoKT7V2yjJP3NMS9N+jH rb0w== 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=yShbEFmNfqRWl71VTou3VbR0xbPnIPB8EdZG6nxwERw=; b=pmGW4RzZVc/h/1y498emHJymrcZgT0EGzInLifMMqw5Ce5osS+blV4ysU99/CS+Z/L Q7iuhJAIBCZo6gt9vtUKg/2lwU2lfTAt/Mb/nYKLfWIg0RARSpZgzkuX6tdjJNBnEf5L 4p2IP8nLKpw7nrkORFpHJ2KULcZdDJqA+kJqFb5+5ZjmO6o3QSoxfmpT8TgjBn7lU46/ aGK/c0DOsCO1H3bdxX6ElaaxK2g0A3RpEzLYi4jNekB7ub9IRf32m1VM675K8mNMuN+3 l1alzG3JtZPMlKpq0OYeZiNtRhKxEOe+xmCagMN0UsG5Np0dwpl9j4rNjXzVPDNJ5DCG FEhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=wuVN6YR5; 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 v5si1053pja.142.2020.11.16.09.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:44 -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=wuVN6YR5; 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 9D06E6E073; Mon, 16 Nov 2020 17:37:32 +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 923FC6E060 for ; Mon, 16 Nov 2020 17:37:29 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id r17so19663497wrw.1 for ; Mon, 16 Nov 2020 09:37:29 -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=F3sAihSVFlANjp/LfbWd5zL/9ZHGZH2FRewnW7XCNYU=; b=wuVN6YR5ue+Y/uISgXnfR8H9qMOLcDPvVWT7AtX/xKoK5SGxjV+5+Orty+TS2hwVgi iG2PbBbT9IP0Rr66YNtfCQre3N4WeP2jH1qGRvoeI3ZXQg9Rp7bAq2FYmlfoS83XvD8U 8ICEDp6UyqffMQLURawrpOBGpJGejJeONJ1n4BuyGfsre/i7n5QHejXLI1vVvG1IHivT y1X8r35U+k3eMDV/t2mhsruyX2gXKmqydP6yrj/uY+q7K5GlD+EjXdFaaSNZJOabuS4M IcYW2GFYZ+WMSAYdANBhceWthtfY/WA74coJmUkAzmgdf8FoGeZlQM0wlVDJ7g5lbEvm k1pA== 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=F3sAihSVFlANjp/LfbWd5zL/9ZHGZH2FRewnW7XCNYU=; b=gGEDy8Nhs+MQy62WTd5IaV0pYEyA4v1mo8Xj1mHpDIE2f9JpGJlC2qjIZOWqfhG4le ufTUivdgIrelnh77E9qAACuISXPgNqCO12NqRmyUz1if3AlzrpfypSU9Rb7o/chVLHqV VOvmbtN83ThXGEV5Lqd17b0CPpQOuhh5whM4s84VXgufcU5gQxITtQVQDKp9h3xpW96R oSdO47gDQ4Lbuz3BEM8pr+Bgv2w/Pc61v4a63h/4392I/KQz5iVtUKNNNKE78UleoZrg 4UHpcTxRRVIlr6djq0+4Kuh+Iun7Ld/pMhfM3SCDNnW2Q6hkeSTul+WtyX2OM0LDcD2F GgjA== X-Gm-Message-State: AOAM530YEQI5KkzD5LzkoAR4yYX1su4kyxw4CDEzc2q6EzY/FIO14aWm E8AYo/FoiJepzp0vO5C8IvBqOQ== X-Received: by 2002:a5d:488b:: with SMTP id g11mr21840157wrq.210.1605548248215; Mon, 16 Nov 2020 09:37:28 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:27 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 18/43] drm/radeon/rv770: Move 'rv770_get_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:35 +0000 Message-Id: <20201116173700.1830487-19-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 , Evan Quan , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/rv770_dpm.c:47:18: warning: no previous prototype for ‘rv770_get_ps’ [-Wmissing-prototypes] 47 | struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps) | ^~~~~~~~~~~~ drivers/gpu/drm/radeon/rv770_dpm.c:54:26: warning: no previous prototype for ‘rv770_get_pi’ [-Wmissing-prototypes] 54 | struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev) | ^~~~~~~~~~~~ Cc: Evan Quan 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/btc_dpm.c | 3 +-- drivers/gpu/drm/radeon/cypress_dpm.c | 3 +-- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- drivers/gpu/drm/radeon/rv730_dpm.c | 4 +--- drivers/gpu/drm/radeon/rv740_dpm.c | 3 +-- drivers/gpu/drm/radeon/rv770.h | 4 ++++ drivers/gpu/drm/radeon/rv770_dpm.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index d1d8aaf8323c2..018949668536e 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -30,6 +30,7 @@ #include "btcd.h" #include "cypress_dpm.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" @@ -48,8 +49,6 @@ #ifndef BTC_MGCG_SEQUENCE #define BTC_MGCG_SEQUENCE 300 -struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); extern int ni_mc_load_microcode(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 35b177d777913..6d3690bcca2d2 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -28,6 +28,7 @@ #include "cypress_dpm.h" #include "evergreend.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" @@ -43,8 +44,6 @@ #define MC_CG_SEQ_YCLK_SUSPEND 0x04 #define MC_CG_SEQ_YCLK_RESUME 0x0a -struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev, diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 59cdadcece159..d39bbd9793cc2 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -29,6 +29,7 @@ #include "ni_dpm.h" #include "nid.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" @@ -719,7 +720,6 @@ static const u32 cayman_sysls_enable[] = }; #define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32)) -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); extern int ni_mc_load_microcode(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c b/drivers/gpu/drm/radeon/rv730_dpm.c index 84a3d6d724866..a9de5c953396a 100644 --- a/drivers/gpu/drm/radeon/rv730_dpm.c +++ b/drivers/gpu/drm/radeon/rv730_dpm.c @@ -25,6 +25,7 @@ #include "radeon.h" #include "rv730d.h" #include "r600_dpm.h" +#include "rv770.h" #include "rv770_dpm.h" #include "atom.h" @@ -33,9 +34,6 @@ #define MC_CG_ARB_FREQ_F2 0x0c #define MC_CG_ARB_FREQ_F3 0x0d -struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); - int rv730_populate_sclk_value(struct radeon_device *rdev, u32 engine_clock, RV770_SMC_SCLK_VALUE *sclk) diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c b/drivers/gpu/drm/radeon/rv740_dpm.c index 327d65a76e1f4..d57a3e1df8d63 100644 --- a/drivers/gpu/drm/radeon/rv740_dpm.c +++ b/drivers/gpu/drm/radeon/rv740_dpm.c @@ -25,11 +25,10 @@ #include "radeon.h" #include "rv740d.h" #include "r600_dpm.h" +#include "rv770.h" #include "rv770_dpm.h" #include "atom.h" -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); - u32 rv740_get_decoded_reference_divider(u32 encoded_ref) { u32 ref = 0; diff --git a/drivers/gpu/drm/radeon/rv770.h b/drivers/gpu/drm/radeon/rv770.h index a3f2bb44979fe..0e15916d0a948 100644 --- a/drivers/gpu/drm/radeon/rv770.h +++ b/drivers/gpu/drm/radeon/rv770.h @@ -29,7 +29,11 @@ #define __RADEON_RV770_H__ struct radeon_device; +struct radeon_ps; void rv770_set_clk_bypass_mode(struct radeon_device *rdev); +struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); +struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); + #endif /* __RADEON_RV770_H__ */ diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index 4a0cf597c11c6..badd8ac6e038f 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -24,6 +24,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "rv770.h" #include "rv770d.h" #include "r600_dpm.h" #include "rv770_dpm.h" diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index d1c73e9db889a..a80a21447a76d 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -27,6 +27,7 @@ #include "atom.h" #include "r600_dpm.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" #include "si_dpm.h" @@ -1717,7 +1718,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); struct ni_power_info *ni_get_pi(struct radeon_device *rdev); struct ni_ps *ni_get_ps(struct radeon_ps *rps); From patchwork Mon Nov 16 17:36:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324466 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503640ils; Mon, 16 Nov 2020 09:38:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmcnfmZ+hvYJh5nyGILC5R5UOUk8qnRoIUtVbXh62ux6pNsqydh2sGaOlBYhGf4te8mhKk X-Received: by 2002:a17:90a:c17:: with SMTP id 23mr17429670pjs.199.1605548289243; Mon, 16 Nov 2020 09:38:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548289; cv=none; d=google.com; s=arc-20160816; b=TPjtcyaYyLZAQBcmFJKuybRSf1ahQW+yB7J5wuNz9aauTVKtq48vInaaFPI9h3o5is 3bgNBbzvXG/86sdE2WBhWFW3KT31PprPKIceP7WZnv6dZdT/LzB0ASLxhql/QM02RYz9 MQl1RBCmT+fMIe7HPdirgJOxXpc5wYrQPNNuRoivxXaeHqgdqjn6Qy454kHDv3vtQ6q0 8Xt79gO4jVxpivDIt37FXZMRe6Gw0lcwWPstxREHgCNFf0djj4JApS1IX10vXkRrfrYp VhjkRSOG6EXlOkWktROuSRXaZK/wG6kuTvzIpamTWFTGkCG3S39cgGWH4X6sJVxM56zy q0WQ== 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=bQScqeODawYLUcgT8gvyxSLPmWydgf8YV7nHlfzYAhc=; b=jsb3Ced56qapplvg3ayfspU8wAba5OWBW5bseihMEUO9b/An81gB+JEU/dTFP1yNeN c7pVGaid/+i5U0HuA7yvenDG0P6O0uoXE8hTGogsD3cQIL+xZFXgg5Inwp4Ms2SDcxwf /ZzIEdn3O8Bt0zkzszBK4O+Ed9d/G5PRvPH+X1r9qRS2cZuoYpNi86unzQ1DbrLOBBxH z4o4h9fqApYWmXxQNndthpHfKuCy9+4GALetEI7HRUwnE+Etr5y9w5F1okbQLSW2YJYS OjlRqhXVpwPWCQp0uCuS5CWTVAgg45wKca8wKSEy4l8rhdTN81scNov4ZCoaewrGxVLt FtuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=u31O7pj1; 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 e12si17655pjh.62.2020.11.16.09.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:09 -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=u31O7pj1; 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 ACD7A6E090; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCA226E061 for ; Mon, 16 Nov 2020 17:37:30 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id m6so2456059wrg.7 for ; Mon, 16 Nov 2020 09:37:30 -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=uPrx+xhJSBB8cqNRTfRxpV861JL0F49FY7TxVtUc7KQ=; b=u31O7pj1zGDcrio/FSlsCBviO7IM8g6lQEnTygECI/nuOgTKY4r0NhHol9iTNLGAn+ zdLph8fd3Yuh5ALkDKEgxnNG18QYa0bsD7qhmJeuL69Mb72Gr7aBgJip239aK5NAxjs8 bwmKEWSGIl80oReFzD5dPK4o61T22DBvKtr/Ld97VBLSmDf/T7Qe49a2nsurDTjVNSSP d45/vKLH6geRF9spJ2Zzz9ibSFfV7qMS1hWPotwBvP0TCMhLJL+wYrqQCZ9jAz3ZAxka tQniI5JB4SFW/5S3t/97fz3dr+LiWmC/rvEilaMRA/NEEYJvS1K5XYJQ4LeiDkKq7xyr uBaw== 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=uPrx+xhJSBB8cqNRTfRxpV861JL0F49FY7TxVtUc7KQ=; b=oXphnmvudBEggkkhuNf1aOa1Mm1iyHKKOhHV2vgRI9UNzrmr0dbyamvQB9qkXD0gxb 5QVCG7LdH9yT0voTVMuxlsaWoPdyQatUvClWZIrcM9pvrueF0L9qqexN5FK6BS7BCdqU QyLrwxpSej2bIdbZ1zby28x38yocVySzAT/7PE8t0gvWZyhFfeZALooDt8nxWeza4kHj w3vOvOJRKocmutjqinYU8M+1EJM4gdFpqz3kc7XTxq3uyzxYVwgl4VQsftaEL7+ulyix OVJXLa/jX0FbB6C9gW3awpxeNWvexjT4I14xP78zZ4doD8N1glbfmeXqeCuwcKhTWCMg kC5g== X-Gm-Message-State: AOAM532gHSbeAb5PHl1rc6jLAQL15s5pTj5PZuvIFZjNXdNOclHxjg4E owCfMtr/39pNXEDp74n92LLi3g== X-Received: by 2002:a5d:448b:: with SMTP id j11mr20117035wrq.236.1605548249538; Mon, 16 Nov 2020 09:37:29 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:28 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 19/43] drm/radeon/ni_dpm: Move 'ni_get_{pi, ps}()'s into shared header Date: Mon, 16 Nov 2020 17:36:36 +0000 Message-Id: <20201116173700.1830487-20-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/ni_dpm.c:727:23: warning: no previous prototype for ‘ni_get_pi’ [-Wmissing-prototypes] 727 | struct ni_power_info *ni_get_pi(struct radeon_device *rdev) | ^~~~~~~~~ drivers/gpu/drm/radeon/ni_dpm.c:734:15: warning: no previous prototype for ‘ni_get_ps’ [-Wmissing-prototypes] 734 | struct ni_ps *ni_get_ps(struct radeon_ps *rps) | ^~~~~~~~~ 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/ni_dpm.h | 3 +++ drivers/gpu/drm/radeon/si_dpm.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni_dpm.h b/drivers/gpu/drm/radeon/ni_dpm.h index 6bbee9180909e..74e3019369063 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.h +++ b/drivers/gpu/drm/radeon/ni_dpm.h @@ -247,4 +247,7 @@ void ni_set_uvd_clock_after_set_eng_clock(struct radeon_device *rdev, bool ni_dpm_vblank_too_short(struct radeon_device *rdev); +struct ni_power_info *ni_get_pi(struct radeon_device *rdev); +struct ni_ps *ni_get_ps(struct radeon_ps *rps); + #endif diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index a80a21447a76d..c68ab2fb1ac23 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -30,6 +30,7 @@ #include "rv770.h" #include "radeon.h" #include "radeon_asic.h" +#include "ni_dpm.h" #include "si_dpm.h" #include "sid.h" @@ -1719,8 +1720,6 @@ static const struct si_powertune_data powertune_data_hainan = }; struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); -struct ni_power_info *ni_get_pi(struct radeon_device *rdev); -struct ni_ps *ni_get_ps(struct radeon_ps *rps); extern int si_mc_load_microcode(struct radeon_device *rdev); extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); From patchwork Mon Nov 16 17:36:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324470 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503803ils; Mon, 16 Nov 2020 09:38:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxnnSKvgVtFiNo9Gc0QIz41qK18/X/qeFYiVGU88+zMKMg9928y/05Zp9YckSpKr/WAnY4r X-Received: by 2002:a63:4e49:: with SMTP id o9mr276782pgl.61.1605548302726; Mon, 16 Nov 2020 09:38:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548302; cv=none; d=google.com; s=arc-20160816; b=MbbIHmmGiZe6kRcQpF1sTYSp2J9RyE0j4Pn4lOujIYb9Odcvw7Z0ZwCW5IFyKVLYHo 5cytZZp12r4+9BwfBdo4EF1uugC5IoJksg4W1b4b41FMh4nFJFyl1Hs9Iky3N8Ib/hT8 2Em6JKjVNL7kWShoIAAWlRkE2V5Z5SkRYGMQ7LZwVRhSI2NpsWkBP3f6p4SokBN/a/wN 2HJ7Xz96fC10jQiP9/+PprnZu2DO05Mhn/cvX0bxRVPX3A6rXL+EXM2iUfa3wwIJEfOt DT4GwwooD1Mxy7kXKo/l2+VlbdVUv5IHcEcBBvv/eiesa0bwxB1JP0CqOpuFy1jZYPkF i7+g== 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=Fjzd4nx4c5GsI/X5Epu3UO9DJ8fA3Kfx5njqIfXzWyY=; b=qol+U0zz3YfdbMInVp/OdXCp5UvLjzEd7pUjf6b6mOG88FttcRExaoSE5FWza169N7 IF+hod/5UagrOe95PBAyVp8JDXP8gJHxSYwcuRlepyBU5oWyqcjDjcmpQPKu/E8FvUD7 m46iPEUrlAh0DRhdPwboIJLUdjk5VVBoGCwNOg9sRL5jg+wHTPtjKHyZOX76s3vA5RDs gWY7LLeSI4YU+CTv0qPws5cyDwZzR1p4lsarptU2FmzCfEvyFZM6Gt+D10CNdV+X/atY z8O+7dAGRbtlDjkb6ZbNZFRELiH2tRwngLfGCh7m3U92C9ehT7AM5FLa7iwtt0qBbB87 BkCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vwvgWAZG; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id fs22si20904pjb.55.2020.11.16.09.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vwvgWAZG; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 6750E6E044; Mon, 16 Nov 2020 17:38:18 +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 377926E08E for ; Mon, 16 Nov 2020 17:37:33 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id s8so19609738wrw.10 for ; Mon, 16 Nov 2020 09:37:33 -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=bDrg++qLU9iWkSFdQ/o4AXQ/+Fr9yLOD8f+3Y4A/s60=; b=vwvgWAZGXD4csTPpegSaVxc/aaIE61/wEIzVAf+2aIeheouwTAKWMFK5gbwrQjoQUC YdTFhAt1VDsys1Z/ImgXTKOzBc2AWRzQVNoMrWf1hMFn3oqRe39Y+qv/7ftRdB5RjrwM qeKk/P7e1p2zk6ZSTnPYROFWXqlzY0IdYWlMrmnPef+a1Kj2Ndxum3XecLXSaYL1un2X JoPscjjZRvLnSz3JVckM4EzRhIOr8r2t6LRylc4WD2587o1UXUioWKXijdBk6/chWToB v3ot2jQMmUiu9bAoCQtpMxCFIUZ3GWMT6j0se+pwLnhQHVV/IcQyGv1LJVZmYvrjECrD 5IPg== 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=bDrg++qLU9iWkSFdQ/o4AXQ/+Fr9yLOD8f+3Y4A/s60=; b=Ow4xUz+eBio8m8F+xdZT+6ye1NYSFrJFZbJjqCzE7L2GXdWNjn92RI2Ovg4gGVjt51 poMhe3uu/9MRZInSyfrHrl2FcRiRVFXCjct/yXvxI1wRVEhuAsTEQZ5rKNDuXbpGIA2J deUf9s8cxwFHzHyLlQJkZvTpZJZcp6uqNCIYVq9Zudq7Vq7cfCuuh44ujYM/MCGKOBTA vE1tiVv28z2bOCyA8ebul5KNrKBW84Cgl4GRtkPcq5Kt8SasgD1copoqTAAw0MXznMBN 2ypM9ixkh+jbKcoDe3PDRwYJUXsTaZ99Fz5enkvYDkKEtNu+7LRNYOyLoGcAB9hIdz80 hu+w== X-Gm-Message-State: AOAM530Eq6gs1eb5EdScix3Xs2Wskre/hd9hl95dXJ/JYe+39zHGYVl7 9bX3S/fCtvb4oiiz/pyTA7JuVQ== X-Received: by 2002:a5d:5342:: with SMTP id t2mr20140228wrv.243.1605548251806; Mon, 16 Nov 2020 09:37:31 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:31 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 20/43] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:37 +0000 Message-Id: <20201116173700.1830487-21-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/ni.c:1378:6: warning: no previous prototype for ‘cayman_cp_int_cntl_setup’ [-Wmissing-prototypes] 1378 | void cayman_cp_int_cntl_setup(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/ni.c:1732:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] 1732 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ 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/evergreen.c | 5 +--- drivers/gpu/drm/radeon/ni.c | 1 + drivers/gpu/drm/radeon/ni.h | 38 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/radeon/ni.h diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index f860f5ef2df88..8fb0b8c3db5b5 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -31,6 +31,7 @@ #include "atom.h" #include "avivod.h" +#include "ni.h" #include "rv770.h" #include "evergreen.h" #include "evergreen_blit_shaders.h" @@ -215,10 +216,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); -extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev, - int ring, u32 cp_int_cntl); -extern void cayman_vm_decode_fault(struct radeon_device *rdev, - u32 status, u32 addr); void cik_init_cp_pg_table(struct radeon_device *rdev); extern u32 si_get_csb_size(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 1c9030a4631b8..ab7bd30802176 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -33,6 +33,7 @@ #include "cayman_blit_shaders.h" #include "clearstate_cayman.h" #include "evergreen.h" +#include "ni.h" #include "ni_reg.h" #include "nid.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h new file mode 100644 index 0000000000000..d63be1c88c0f1 --- /dev/null +++ b/drivers/gpu/drm/radeon/ni.h @@ -0,0 +1,38 @@ +/* ni.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 __NI_H__ +#define __NI_H__ + +struct radeon_device; + +void cayman_cp_int_cntl_setup(struct radeon_device *rdev, + int ring, u32 cp_int_cntl); +void cayman_vm_decode_fault(struct radeon_device *rdev, + u32 status, u32 addr); + +#endif /* __NI_H__ */ From patchwork Mon Nov 16 17:36:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324462 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503668ils; Mon, 16 Nov 2020 09:38:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDziVu0cgbZIID699gNq40SOCOP4DnDtQC+JhTHNMmkE6QxNp8JFoVXjMKma8GcxcRpt5b X-Received: by 2002:a17:90a:9f85:: with SMTP id o5mr16322538pjp.63.1605548291919; Mon, 16 Nov 2020 09:38:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548291; cv=none; d=google.com; s=arc-20160816; b=W59m/B6d8mfrccjuvdZsi6jJ2jRuWZI4jao8I09UvWkvBeB/Q8WMaqT7op5LFsPo+I pSY4FjjY3+YyOBrTdlyA3oQM60Qyn6ajNqvqAkIXC44BFkjUNte8b4rHSixTvwMdmM0A 3aTmfyGvIn1mq8bI+zT691IRyhZDCkbqLet5fwpSbItl01AysLYXGdOW8cx4MVqsi+En VsseNHUSw3ies46Hh5Xb0xUhzceVHrMH1OFnFeezkYXLRkU0EM2WOqe9K4x+/4k5oTps GOeEx5dDKF/n4nVn7ME18Z0+7UzmmpnB7UXUxeBv4uePu/cbXU8Id4MuqJVdqXojcEoh 9mWA== 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=YZFWxL1Q0BrWVA9mg7O3gqbuRNVwT1nYa8gRAkihPLg=; b=Fmzs6Zfn7nnCsp6aX5/55X6KhhLq73ZJ7/9e9u+Hp7+AXrrwXcWX8O3y9NCy4M25lS xM+e6plyFaI0R2wEyVqyKsPMtxijG2ix1MQGf4tWiD2VLTcQ30cpxbr9hpPTED5X17oo wy3Mx0tKw7NrOXG1bNmzB4QW+AP98UfKpdyKH/tPZtH3CMnidMEhgCEu1X0ppyXX9fCY /frKMdJlx6q4m3Kx8AfcHKMmY0dXEXBNXNy8PYChZnzzAu2AcW/ObEjty+2rBJZMZtrq Np6D6XYayk1NaiEC8lM/uSgygfi8jb1qoW696X7Bc5//T3ksk3MTG575BVVfoVIYvRvy UZmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A8HzgcFm; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id d11si5741354pgl.232.2020.11.16.09.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A8HzgcFm; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 7081A6E07D; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD5026E061 for ; Mon, 16 Nov 2020 17:37:35 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id w24so38117wmi.0 for ; Mon, 16 Nov 2020 09:37:35 -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=bUgD99dAZfuLWNam3kGxkjEykoel9F1pl4Jg76K7MCg=; b=A8HzgcFmHJlDoRnxOLVZNJsNZd5RSaDMhSbJjyA6Zsf+uOVZiwxgsrZ3qS/yomov6M ImfkYga1c9za82A3rxY+3q1sgd1dKCR4FLFTq54FzNvsOXjP4jT3rk7iNq4V+OfNY1qz HA3Guu8rubwWPgTwa96fKsPnDlmxn4lljezuu9Htm+kOdivDmj83mDkrl9I0Lgmt7hAI NcjebhEvuNFy98kZ0fjw6avLJaR4r/+QtLJqJbYxr/c1rqXQdoPd7Z2LCUKWcWb219aN MtgPdH+xHTSR3WfhZ6yXP6rToCbCsx2/OQ7yUsk6/6IyW62TPiCBhsUK01Z3RQsgytV9 pl9Q== 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=bUgD99dAZfuLWNam3kGxkjEykoel9F1pl4Jg76K7MCg=; b=orxBA3TLIbzb02XfKkQaurijXwVK+0o7n566R0Ai0b8XwxepyUNIyxlsM+NlSsI5Tp pj2sdGNkOhk/fd3I3fqQKlst2zCItcIz0+ay02nGB5y7xuAKBgulckuL8Qnbd5vDryZW gesNUI8d3PP73w/sscW7CFNJsyatgWOak/De3CpSPQBkbeTRNVuwj/joo/te3ouv7zxt DyFu8e0/aIrlN6oMCKhiNxTjNCZRD97JlQdlU3s4Wi2hhu3US7fQe03BvvHwn8eSDs0/ qS8VTziqGoWyieDdtTBxRJRMZ/AIHkz2svcKlFO7Q2VxbAAcIK+tmh9NnV/jZO+A8A+n /cag== X-Gm-Message-State: AOAM532uC3HT1MkCQ2jS4ZIFsu0WKywoxfthwvHhXde18WHbn/rKh9iL Gm7MCH6BR7ak0He1VhfBTD+j3g== X-Received: by 2002:a05:600c:2204:: with SMTP id z4mr15910947wml.57.1605548254381; Mon, 16 Nov 2020 09:37:34 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:33 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 21/43] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location Date: Mon, 16 Nov 2020 17:36:38 +0000 Message-Id: <20201116173700.1830487-22-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org 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.c:1615:5: warning: no previous prototype for ‘r600_gpu_check_soft_reset’ [-Wmissing-prototypes] 1615 | u32 r600_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/r600.c | 1 + drivers/gpu/drm/radeon/r600.h | 35 +++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/r600_dma.c | 3 +-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/r600.h diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index f09b6dc5cbeb3..94e8815e5067d 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -39,6 +39,7 @@ #include "atom.h" #include "avivod.h" +#include "r600.h" #include "r600d.h" #include "rv770.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h new file mode 100644 index 0000000000000..2a3915f0039e4 --- /dev/null +++ b/drivers/gpu/drm/radeon/r600.h @@ -0,0 +1,35 @@ +/* r600.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 __R600_H__ +#define __R600_H__ + +struct radeon_device; + +u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); + +#endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c index af6c0da45f28a..89ca2738c5d4c 100644 --- a/drivers/gpu/drm/radeon/r600_dma.c +++ b/drivers/gpu/drm/radeon/r600_dma.c @@ -24,10 +24,9 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "r600d.h" -u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous From patchwork Mon Nov 16 17:36:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324458 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503552ils; Mon, 16 Nov 2020 09:38:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1M3uJSq0sKhjKk1RWBOmZbAgeIw5jCR4IRaItHcS1mlW8mS8i/E0ftWlgc2DZBRPiTA/s X-Received: by 2002:a63:4450:: with SMTP id t16mr274790pgk.312.1605548283497; Mon, 16 Nov 2020 09:38:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548283; cv=none; d=google.com; s=arc-20160816; b=vjsR2Tx63WJ6EKpFZGbTbcSt8wNJdfuZPyq2dVy5HNcGLxkTXcLwXmMiK8S1knbnu4 Ri7B16F4e/oxBhU6sgTssmqE3gn6wLTHuWPQCrR8Aseal+o2u/E8+/+teuZcOAke7PJb YofaB/n0g90EuGLU50UEHtd0KmEFdHjQZaL+3ovDz2uWbP69/QkVjyXcuL8b0+lrCMLJ 6RAwYMioG+ecIlZINxj7xc2muAoi0TywfbLHsZ1Ej9p6wRiuV1DRdQCMjsmOyu1pqi3h wy52MmZT4Pbfp45uaiVG9y5Ac8gSUsq/6Sp+unMsXWzFvAgW6xIt781mkiTyXMbl788h YB/A== 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=86sAmQENKMgvSKj2XmODtweIyU5jZpvlOLy2DSzsRqI=; b=wi2dZXDUgHq8ers1U7+YDLC/FFlCKmFTBUDgCYmVPdcyYecrmmR+xOsc9E4i9DpEAD Zm5y8Fk991jX6Ol3Zs2n/6S+T6YD/yfi+k0cf+jtetK8B+yL5lleXjhDEGbi/1O1T9V1 Mtb8PLd1gcy5eiPqzSLNI7YmcARcsT2Qnfb1f2sYhx4VTJcBfdpW/llkxy8uUDDNY+Md jI2uIkAGmpaoERXRdRAVk+8aSvef256XjXrREV8hTIJ3igK7xCgpzDzqmGPb2NuxAops acyu35//TwMWntiqXSauTfa4XlCBxebvPLwf1t03ZUFnwqV6JmOIsr3rStPN2eiZB6fE NuvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=R2Zvmw9K; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id b17si4266775pgl.370.2020.11.16.09.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=R2Zvmw9K; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 6DA286E07B; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 65EDA6E07D for ; Mon, 16 Nov 2020 17:37:38 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id s8so19610184wrw.10 for ; Mon, 16 Nov 2020 09:37:38 -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=6eWjxCy1b/Di1KDbBj5VEEMSjXTSXChj8189ArvQtHE=; b=R2Zvmw9KS2p/uW92MEVvMAZHk/cC36qiZDKxllEIdVedCqMaJxEhSpmCl8uEzkgxvs ziSwIPTt2zvHY39MLFUPlML1cC0Y4JOoKx3lqQ8apPiW9uNx0p0hyqKCg3mdkC1uGZpo 9QZLpveawM4J2EiSh9h4Ky7yUMPlTMDW6etAsDjbjhYc6A4T792sIprRsqKM6TO+Cuia qRZodDurakwR/Sa0L1NztR38xENLghD8JYA7jLO9eYyDMWoNeqNc8F8voGZxgUOBAoiG PVYJw/2UeoXSIhRt0aiFE/6FKhjqwCslGMIL6Nvym5qzUA0y6W2dVcXzM/1fuh4TKJik 2ecQ== 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=6eWjxCy1b/Di1KDbBj5VEEMSjXTSXChj8189ArvQtHE=; b=kMb1efmi18S7kI1nsrenqTaE3o2awjMejdQ0vLU/nUcq7bwQjinegJCNsLA+RqNeY4 CZL+4XazWKs9hcbOVBPeUVES7NVXDVpQNKHHlrRj9Sz61hbGXi73uUkQHxCZ3TAnZ1ia XnviwQL7t4a7oUlQiJrWOekJmt86Eb1Kn9F1xJEbtkpB48ijAgVi1w9b3PlZYL5rV+Fv 2/aKPqXlnCIB0oCMiXKPgWOstGg/3h6fBas0uh+TFRzL0HoGGpDUr+oHtsSuukU14WEU gKR0hkt4wJeD5WwM0pot+5mw1Npfs3Rp5aFeyK3UE2SdBCmN28Qc9Q/0AKteo5BscQWX YHeA== X-Gm-Message-State: AOAM530GjAikuSlbg0JbWXFHGvJUX3PCJwSfB624P7qP07zdddyvZXct +dF+sM2oyHj/e3cvi8vHsv+p0w== X-Received: by 2002:a5d:448b:: with SMTP id j11mr20117581wrq.236.1605548257084; Mon, 16 Nov 2020 09:37:37 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:36 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 23/43] drm/radeon/evergreen_dma: Move 'evergreen_gpu_check_soft_reset()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:40 +0000 Message-Id: <20201116173700.1830487-24-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/evergreen.c:3825:5: warning: no previous prototype for ‘evergreen_gpu_check_soft_reset’ [-Wmissing-prototypes] 3825 | u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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/evergreen.h | 1 + drivers/gpu/drm/radeon/evergreen_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index 30c9ca99ced90..eb46ac7776951 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -47,5 +47,6 @@ int sumo_rlc_init(struct radeon_device *rdev); void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); +u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c index 767857d4a8c5c..52c79da1ecf57 100644 --- a/drivers/gpu/drm/radeon/evergreen_dma.c +++ b/drivers/gpu/drm/radeon/evergreen_dma.c @@ -24,10 +24,9 @@ #include "radeon.h" #include "radeon_asic.h" +#include "evergreen.h" #include "evergreend.h" -u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); - /** * evergreen_dma_fence_ring_emit - emit a fence on the DMA ring * From patchwork Mon Nov 16 17:36:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324457 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503531ils; Mon, 16 Nov 2020 09:38:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzB+JHrlQsD+wFWwOzncokBIE3a+JqJVSKf6woxjl1bBogV2cwzBG273bWj0VS7MAU2nPQZ X-Received: by 2002:a63:1514:: with SMTP id v20mr266989pgl.203.1605548282003; Mon, 16 Nov 2020 09:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548282; cv=none; d=google.com; s=arc-20160816; b=WVSOYhV+5rp/r1KkXU+a1BnLoNqmlDQS8YjiGta+5mMRJWKHivDf5XQwHpqeC/25l9 wKsjkQhWWPka5LY55S9Jr11vsUEoaKwVjtGLJH3x7vKJB4cjV+fRc/rKyMcBQZpsezJU 5RZbw1PiQRcSkhhZ3VPpVLkqv/p2qvzvUHU7ILjE6Ie1oJdq3p8vCSnEly9rcuEfXNR0 IhxzGU7txeXfVsmK5iWC/rIPX0hQw3rWIEHcEca4W9vFkCzAteaE2nVs7Mu9hkubBY0l qwFtZuCzEg6nz/SMXAo8E2EUw2PfD7qWpnyxn1RSWgqPmAh6XpBfdt7xOAA/VjfFQhOZ 7zMA== 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=aWCjRmlGYkhmYN2qNXDv29hF6E6fBjezzKEW13N80JU=; b=F9sMm9BEgbN78YZkmZqXTcvqaZ8MuqRiqnS3OSjvL0enBZUJP/4n0G+qFUrFJEtiAF dXcu8+9Hu21LjFsZ4iW75ptsdyBC3wRBl5sYHgjbRwBIYPytVgNwLZ9+qW+drAuroSRJ i75qwTnw3Dmcb9VQZcBKns4d/zf9iL2VnKs6yn8r82QHL+WGw6tYKS40vse2MikTTrVI 1iB9ByPKqLnX+lSnqMd8tka93r250+wB6agNsrr/N+L2N8vnb6zo9EsGX40rE/8mnsfn AohJ3ATGCjNMZbfONmjiOOmdBLMwdZOKcRC8ncQHa23eB+h6+moCNfsMfYiMQYz8RkY5 AY8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=U3XpEpiW; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id u23si13252pjy.80.2020.11.16.09.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=U3XpEpiW; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 020286E06D; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8D3676E061 for ; Mon, 16 Nov 2020 17:37:39 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id a65so32238wme.1 for ; Mon, 16 Nov 2020 09:37: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=pyNxvxME2tG4MioZh0DLPpucvuaAdYEDiX4yy0UM7tE=; b=U3XpEpiWRsz0j+hMtLDZ8ijrHq2pxzt4Q63ge8BICYDILPrM0Uk4Znt6t3gnNNK6TA NlOKoWX3AV2dY6ZopWymRVjS6pKydRf3Qy9yyqC+dsxNtmX1UWDNjK6g1ijj8+MSV1PS diXcNe5FtP7YT1fRvskacyGs+kp2Rj2sSYX2lkHzUuwA+ZHhRI4Cll4N/5sRzHkFYVaq MkX1VQC13yUvBzlVxq3Hmv3pczoGHnxuBNInJfWzFE11iZ7h0ZMcoMLObo7M9IgVC4/R k6amszu3ErtAEjGk8HeP0Ws64DknQnHPnko2q4YWihbQ/WiOE45rttjDJudtgCmsouyQ M+7g== 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=pyNxvxME2tG4MioZh0DLPpucvuaAdYEDiX4yy0UM7tE=; b=WU96sko8KB1pn5cuA21dz4DsPvUYH+o8i6PpvcS7/LzovmdwulPj1ajzE9ej1298FI F1BgnzF54EcXwqrp9q3o/3GoezR5q57aQCq7WKVGHKm/tpxoZnjeQd8DGjZMUWy153Db psLtHVxIEYei4L1VT8LLFWb/LV7vwsngxc5OmfzJcQyDqYycxY8qvDa1snbPChuCb6d8 oz+roRtko1a6wcIlhncorKg+5mYVezWxL1ITcw8kwBe/CRcl6uwxBk+vFcGb3ui/UnJA UK8PtQPYN49Eo2I/C+mvRdC6YIYZ74N00m55kRhrkoPhUB/81tED+KELEDsPhYsVTwFQ Do9w== X-Gm-Message-State: AOAM531xL2mOJwPC9cnDI/0Li4dfwD/U/+itiZDrhZVYVyK/6e+7/vOS m3jwHhuxCscVC2aw6YXhiZ4Edg== X-Received: by 2002:a1c:b0c4:: with SMTP id z187mr16321450wme.113.1605548258220; Mon, 16 Nov 2020 09:37:38 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:37 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 24/43] drm/radeon/r600: Move 'evergreen_rlc_resume()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:41 +0000 Message-Id: <20201116173700.1830487-25-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/evergreen.c:4380:5: warning: no previous prototype for ‘evergreen_rlc_resume’ [-Wmissing-prototypes] 4380 | int evergreen_rlc_resume(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ 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/evergreen.h | 1 + drivers/gpu/drm/radeon/r600.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index eb46ac7776951..f8d772e612a48 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -48,5 +48,6 @@ void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); +int evergreen_rlc_resume(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 94e8815e5067d..b44e0c607b1b1 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -39,6 +39,7 @@ #include "atom.h" #include "avivod.h" +#include "evergreen.h" #include "r600.h" #include "r600d.h" #include "rv770.h" @@ -113,7 +114,6 @@ static void r600_gpu_init(struct radeon_device *rdev); void r600_fini(struct radeon_device *rdev); void r600_irq_disable(struct radeon_device *rdev); static void r600_pcie_gen2_enable(struct radeon_device *rdev); -extern int evergreen_rlc_resume(struct radeon_device *rdev); /* * Indirect registers accessor From patchwork Mon Nov 16 17:36:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324453 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503464ils; Mon, 16 Nov 2020 09:37:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoNIqzvwJOiqfwKuuP9287xGXt+5eqKcTi7qkvyE/r3z/rTqInYaHORvk9Z7DUJor4CNCp X-Received: by 2002:a63:7e09:: with SMTP id z9mr288715pgc.150.1605548277003; Mon, 16 Nov 2020 09:37:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548276; cv=none; d=google.com; s=arc-20160816; b=q7iIMy0bKEpGdXzgOhoP59Fyg0Wl0EHR2Id/GKWBYKJ4n3kMl6X3h1atId5Vye4tgY d3Ia4RwsCeUFNkBC9obV5HPbFvfUYu84l3k9Nc+pJbg8b4FhSxNHzhu9F8noidB5xeim LqBukUP8WMu3wM9pP0drGJKWTF6mp78YpicQHbgzNgo8klAuETmSBiB7EoFT33TIiD6m ZCx8T9vypTqsEXNy9s2kxEPJV/dJgjFffrjMptfrcRaEYsOja9U7uxRXjT6j0w9F17ml YT6CH1Z32GtOglWS7G0kAw2CrtnC1lRt0tdrtn5fxWNHspP4j/aJhjdV/rMKvPCbCg0M woPg== 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=gW7AqfMy32rPZ29FajBndYD0OykcaUKA4oPpUUPGMjQ=; b=n7Hvz+sufJHGPdAU4GF34M0a5SWxEma24TvywywN951+OxFGHwH5+nB0YItjCo7mz/ IqsHMie0WmCw3fJpvFAN2vUbTTTIdNSchmp/I64H36SroLhXf3YW4IiRoYrub4S+9vId kthGeKfbYTA9gUPPJQq3UQ/uqa6h8eDH/izbUubJ8YjspGXsGe4f1/qD5QAc17ul26LS j66xNA+dIGV7p0DG6EVLXrSMelFhrJtodfOKW6/VZJ5J3QJTXqWWLYsvotUUq8Qy6QIJ lGTeiTFcp7cP9JNyODBIdPNygqCb9Q6GWM320WTPWf0x6238KpBFvP1E3S3Abn+zllYq ah4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WRLJ1q4U; 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 s17si5273805plq.369.2020.11.16.09.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:56 -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=WRLJ1q4U; 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 A87866E061; Mon, 16 Nov 2020 17:37:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFABC6E04A for ; Mon, 16 Nov 2020 17:37:40 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id a3so11009wmb.5 for ; Mon, 16 Nov 2020 09:37:40 -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=5TTguyaQuVrd+USo/F+rMhw06NLnXmuljJDk3k933AM=; b=WRLJ1q4UqmT47CdbxnEAngUmUOahyGqrN/s44SVmCRGE6+Btb4XOge97Tzm/ASOQvQ kHutEnIMP6rdOJgwGTAuB09lr/dhhN/C9SIIs5MrfN7Hw1/lT9c19lWAECUjdPa/KzFp 9WRrW4r8nRawZqPNQclJS4KzH2uIjbHP4ys9TnqtcZPjX+SZRjt1oNPvWGWb6WeY5OHz 3GnCQNaU27a0kw0JU1LPD5VPe/xWhnp19+XdWN77fMIVozxsf5337JKUQThHXJ5HuR7d 8pR0Uwf6UbEh1hBKF0a3CAPdBv/gWuvcX04dnPdYdSsvHxCMg2WVTP6jTa433VpmMBi9 8DVg== 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=5TTguyaQuVrd+USo/F+rMhw06NLnXmuljJDk3k933AM=; b=OxuW0bEluRYIPb2XAeFqOVyr73MGMHa3k2kwwQh6B7b9RKD3cnpT4tEgVzGQZQa3U5 piIqqIIb1oymeP/U0z9BPY711uedRnwyTKrGVk+HoDUK3JWZez/eq7KwfEj2/NukRNh+ FPRBFLokaF+39DD4JCOhmEvOPjjNrJsSNy58N8PxELiENVuRITuiHxhRUR5DATfnou3n idPwTQDY5hXg9NypGVOKsCE/+oCB6yUG1rc5k2j9dJbNhuKNCyHE8ziSvDxqkab5vaYC o//grKKn9jhE97KRTWgz5NlY04tXwfxiw099Hoijvh/b9iKL4AsLN22m/FhjbDMvcsRG 99MQ== X-Gm-Message-State: AOAM533MFXuB/OW5k/NWyIbTx9gQSO2hd2cHK+Fk3w9nuwoklgnOllqA vfAvaZZAxaDu5IyHOOAkZI7ELw== X-Received: by 2002:a1c:c203:: with SMTP id s3mr16952678wmf.77.1605548259534; Mon, 16 Nov 2020 09:37:39 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:38 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 25/43] drm/radeon/ni_dma: Move 'cayman_gpu_check_soft_reset()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:42 +0000 Message-Id: <20201116173700.1830487-26-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/ni.c:1733:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] 1733 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ 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/ni.h | 1 + drivers/gpu/drm/radeon/ni_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h index d63be1c88c0f1..9a5f31a05e68f 100644 --- a/drivers/gpu/drm/radeon/ni.h +++ b/drivers/gpu/drm/radeon/ni.h @@ -34,5 +34,6 @@ void cayman_cp_int_cntl_setup(struct radeon_device *rdev, int ring, u32 cp_int_cntl); void cayman_vm_decode_fault(struct radeon_device *rdev, u32 status, u32 addr); +u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __NI_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c index c56136848360e..bd515ad4fe4cc 100644 --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -25,10 +25,9 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "ni.h" #include "nid.h" -u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous From patchwork Mon Nov 16 17:36:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324459 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503563ils; Mon, 16 Nov 2020 09:38:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxigImYDnpKufYPQM77U4db3s3rTV/ZO3JW2eQl+tMG3o3qT6sAfJaENlH01kxJPW2VjwS0 X-Received: by 2002:a63:3484:: with SMTP id b126mr247177pga.323.1605548284855; Mon, 16 Nov 2020 09:38:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548284; cv=none; d=google.com; s=arc-20160816; b=iN1iiKlEqCWPWNxicrBSsPzaDWPCVheJ052NKLPKS/heXWGXj+Tu4UoAs/iqfBakQ4 /8K5kh1ZdHba6M0bAMwJ6flYPOq4TzARh8STv2VTPrc6AKI2nP+9w/PoZ7zD34mbC1Yk PpSB6kFjyD/PdUIF/2tGl/P3Z3wf9aMKL58BaB91FPt/lg5I0w4z0W9F87VWNU6AqVRQ 4DqoTie5nahKD27j6QBbCTbvjp9/xvoiDHfOh6Nj/WhqQIJfYG2oFz4H+EQQfWPMugpP jKq0W3hKKGNc+5xOjUloWvD0SYIzwQjoExDI2HBX+SPqzdd4wO4qp8btOcEBaCAAokUX h4+Q== 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=6WOsltnY+D0CuXNrdxx1fcTV9NNf7nvbmHjf+SVNo8E=; b=gOULjdtVbs6iZGl8jjCvSpF6tCnpFITbNdZAvqLQN5dFQH/aUyf24qIzDyA5NTilEq DkqOwOeAEQod2DxT4cDGP4ZznGkFRjO+ekpn4oN3yl+39nrsjAfqgzfM6It12aBEHtbT eq/ONOLqrABwJR4b5EQFw6CrQQt3RI/GGYd0PaK9OxrQx/YmPL9kegvcGnnB7YcToa36 qF3KzJ9ZrIqQHOx+5/dtfJgalVuiL+Kt0dyojPZrIa3ZxFd/IA0KBSuvweQKNkW8sxrV ueDXUUdaDaNaw9b3FfoY0+YbZuFlHMzWlslubDzyTIXpP8FTB2M1q4mNdUCif7eZQDT8 reSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=wN846j+j; 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 e8si19817pja.67.2020.11.16.09.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:04 -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=wN846j+j; 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 8CAA56E07F; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 085F86E04A for ; Mon, 16 Nov 2020 17:37:42 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id d142so19141wmd.4 for ; Mon, 16 Nov 2020 09:37:41 -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=eP0WyWZg5ruAlRDHyNqDbB7ackT3+aNOib1WfADr30A=; b=wN846j+j1t9h9fPa28Onu7GZYXmQoYRLOxLBMdsgxmd2qjwO/2SHbYJ4aaZPTOwNwI Ie150qvycEdxzYdE6ALo/tJp0eHb8s/iM39uIWYiZQDcB4VODCCA6qx2PL3x1IxOyEzm pL94h3zfHi2M8NAko8DKtXEINUpu2UL/DlQGS7Zk5gfFe80wLQ5orA+eTl3yaAh0r6VC KFIJU5Qe6Hc25f0CT+oHuz4AYsncg/BtVJ0gYQz16eTW0QE8347rmKKa7A+A6aAKLWLK g+FRI4hv2PhqAzly5Q9dVAuFaGxdjBHlsW1nFIlcbHXoOuBALWhGlG+j2fgjcbRPY70Y evIQ== 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=eP0WyWZg5ruAlRDHyNqDbB7ackT3+aNOib1WfADr30A=; b=RhFcgBlGdLkq11MIlLyPgP+A2IoLrkO2CkeBIyaT1kpIVu1BoBxuSaykz3Uoz5I5fB /TWDB77J/I1ufUSpkSKGjMNOEXy5yVBoLhd2qgyyaOIbz9/ERJYEYIzXuNWDY1HTp70s ENPCFmvaQj/9yfXINAfb95487HP1gMEQIaf7bpQmL4hQzR/H85fyBdug2kIuVp0K1UdO AR3QY7V77r7huGK/RXUUg2sa3k04x6/ayKJaWqIOjCk/zFqy53Cp6iLUpRHC8YdJKY8j n2zL0fPD3mgR23LVEEY8rbLLMamkDka2iKNN28PcB5PPdqHi6p4/vnlGsJqvPy1b549E Cgcw== X-Gm-Message-State: AOAM533m20Vyp4zvWHFceHJpOToh/f1tm7KHxdG8/vED9QNloj1LKfsx fex1sHMcbrrnrj6cPXpsK9Sjzg== X-Received: by 2002:a1c:c90b:: with SMTP id f11mr24711wmb.54.1605548260732; Mon, 16 Nov 2020 09:37:40 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:40 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 26/43] drm/radeon/radeon_atombios: Move 'radeon_add_atom_encoder()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:43 +0000 Message-Id: <20201116173700.1830487-27-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/atombios_encoders.c:2721:1: warning: no previous prototype for ‘radeon_add_atom_encoder’ [-Wmissing-prototypes] 2721 | radeon_add_atom_encoder(struct drm_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~ 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/radeon_atombios.c | 4 ---- drivers/gpu/drm/radeon/radeon_atombios.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index cc80651b25773..be96d9b64e43b 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -37,10 +37,6 @@ #include "radeon_atombios.h" #include "radeon_legacy_encoders.h" -extern void -radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, - uint32_t supported_device, u16 caps); - union atom_supported_devices { struct _ATOM_SUPPORTED_DEVICES_INFO info; struct _ATOM_SUPPORTED_DEVICES_INFO_2 info_2; diff --git a/drivers/gpu/drm/radeon/radeon_atombios.h b/drivers/gpu/drm/radeon/radeon_atombios.h index b7c76920feb7d..a895a7002c3d3 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.h +++ b/drivers/gpu/drm/radeon/radeon_atombios.h @@ -28,10 +28,14 @@ #ifndef __RADEON_ATOMBIOS_H__ #define __RADEON_ATOMBIOS_H__ +struct drm_device; struct drm_display_mode; struct radeon_device; bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, struct drm_display_mode *mode); +void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, + uint32_t supported_device, u16 caps); + #endif /* __RADEON_ATOMBIOS_H__ */ From patchwork Mon Nov 16 17:36:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324455 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503491ils; Mon, 16 Nov 2020 09:37:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3Pl1stChnsrQS9OVUZFiLXqjhSp+up1D65bmSwHrf/XyGPfqicZYOjpQKAqwTkQ3CxGz/ X-Received: by 2002:a63:f24:: with SMTP id e36mr270149pgl.57.1605548279173; Mon, 16 Nov 2020 09:37:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548279; cv=none; d=google.com; s=arc-20160816; b=qGS7lR1XPX5MpTBu57Mqpw1suvXjrk0Uy1AxNYTUdf6yOMTC8vZG8+TV917V/tbdPi 0t6H1O6JJGlGwP76m4z8iBPnzeUQsH9jU9ExaDSu8Df+YTVJ8mnuayi8uCaVmUHPDpgs 6adYwqg1fNlUzE7ZVbgPWv2OOxA655wVcwqLmwFu51OEHAJY949tm2Znc55hT36VaPNq IOln9LlR3u+/sWJ+lDpPobWxwR9opkglurJ0rv5i1XoCqbo3/FHHQ2D/cCDtQuDAzOGJ /WnAxreO24Qgv+LuGHq53h2UbKynkpZTfRKqzu6mGuIkJLRTzKd32ojvIxDubf77lOk7 jrcA== 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=cRogsfPjvEl9nAEn61xyDYmXUv55fxL+OK9O51v1gDU=; b=p0S17UxN1q+aCeA66us2XJLsw2o3wVCp8GUkzdy/p2Qwhjv73lt6jo5ZFl1vkh/q3h 0vd1vY4twkqNmSetEba3uq1f4gcWfl5831a+GlKtMCaA8Im42KQu4k03v4LW9jPslJB4 VffJ68LHfhnCemMR8/5qO5AhqfE+m6H+wDs9Wm+V0/erUvmeXDsXydDGpztgcN04sQmD cl+FDNqO83SHMRaNkZlNsXm+V8xUUVj+48Wx+kG2y8U+omDhCV53fFsKgcju6TcA9H28 aTX+o5/d3LFaRJIoq1rQP+tHq3GYF4nEU/LHLJlLXJUz3666sh1Jo/nKWxXFl1/GofIo lsrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hJrk2c+M; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id v6si16292957plp.384.2020.11.16.09.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hJrk2c+M; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 00CF76E069; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 415476E064 for ; Mon, 16 Nov 2020 17:37:43 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id m125so21586wmm.3 for ; Mon, 16 Nov 2020 09:37:43 -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=3URZpu7tsjM6Y8F+U84uwe7BiqZoOF3VMCws5wVhmBo=; b=hJrk2c+MVVdRgOF38FOlxwZWmiyLarfSS1Z8YpKs4nyoSArMJJWYspiabittQjN7ge PEYx4sy7GfltMkTs9r1iIcNL2prnE133gYn55x1A92PuiVhze7KyJISv2G5hxR1c7tCo TKcGtqO9xPjRvnmgCca27nh5qDlemubQhWynuDC2ye9xIbz/1WKREnvkFuPTp9lqSJwB Lyt32RJ0UiU6AlAnqUlzu9N9RhT8UVpqrogxW+yNJyDb0z++8MYJYiULpdVM1c+b1Itw dDOykSolZ5VlKqsKfFuGndE76bz3Jj2OUe0QbLhyi1VnQlFaMcjB2sOqdiKFpvWAzWNg XXvw== 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=3URZpu7tsjM6Y8F+U84uwe7BiqZoOF3VMCws5wVhmBo=; b=CJknQDJIwVriIp37CyGe+LFYV5xCiWRZIoZErM7klltyHQy0UKuK1pjt5yo+NLBnnz 0PPW04Q/eH09cYeKwUvRV3cxInBbxetLYwKaOwki1dzeKyOwdNMgRcd3pLI1PeyMq9F4 z9aBQKVXE6mi5OidgM7JrDz+uOpyzxI+wrMvOW4+RNJ5hjeKqCgb1EiNglfCcWWJECdA kGZ5wDS31wW4gO0+og7FJy/Orny7MfhQmwc6kFPHuLAOpTUAWZPEog8jz0jSKClFy4Rg VHSGmQ8Vv5fha+ZvD8YaBt9VXPbaNN1EHGYWufettVNanbuofK8jERkwOk16p2ec4AfG zhPA== X-Gm-Message-State: AOAM533UrXTUrMpe2ddv2HVhT4jxBRSjzvASjONbTM3RvVnupCxWKTYD TeFa2sHtdQW6TkxlTivS9dG4AA== X-Received: by 2002:a1c:97:: with SMTP id 145mr18960wma.72.1605548261899; Mon, 16 Nov 2020 09:37:41 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:41 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 27/43] drm/radeon/radeon_encoders: Move 'radeon_atom_backlight_init's prototype to shared header Date: Mon, 16 Nov 2020 17:36:44 +0000 Message-Id: <20201116173700.1830487-28-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/atombios_encoders.c:186:6: warning: no previous prototype for ‘radeon_atom_backlight_init’ [-Wmissing-prototypes] 186 | void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ 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/radeon_atombios.h | 4 ++++ drivers/gpu/drm/radeon/radeon_encoders.c | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.h b/drivers/gpu/drm/radeon/radeon_atombios.h index a895a7002c3d3..fd03755e6fa2c 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.h +++ b/drivers/gpu/drm/radeon/radeon_atombios.h @@ -28,14 +28,18 @@ #ifndef __RADEON_ATOMBIOS_H__ #define __RADEON_ATOMBIOS_H__ +struct drm_connector; struct drm_device; struct drm_display_mode; struct radeon_device; +struct radeon_encoder; bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, struct drm_display_mode *mode); void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device, u16 caps); +void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, + struct drm_connector *drm_connector); #endif /* __RADEON_ATOMBIOS_H__ */ diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index b60a373d3ead3..46549d5179ee9 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -31,14 +31,10 @@ #include #include "radeon.h" +#include "radeon_atombios.h" #include "radeon_legacy_encoders.h" #include "atom.h" -extern void -radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, - struct drm_connector *drm_connector); - - static uint32_t radeon_encoder_clones(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; From patchwork Mon Nov 16 17:36:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324467 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503679ils; Mon, 16 Nov 2020 09:38:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGyd3VhmGO/k3N9vKGes1luODNabVaij26e+K0M9UZkLjzpxO5L5n/MpIYd8dpeB3yLLYC X-Received: by 2002:a62:2b88:0:b029:163:c6fb:f2a with SMTP id r130-20020a622b880000b0290163c6fb0f2amr14590558pfr.7.1605548293299; Mon, 16 Nov 2020 09:38:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548293; cv=none; d=google.com; s=arc-20160816; b=hdf5YGih6K6mOAiw+MmTKBLTQ+2bgU5YQtd4MQ0dtpyjBATx6ZSK83s0XMwefHtuTf GJqQrcgNEj5QeTEaA49Z1x1etehF8yXd7A7sGMxORAGxvdriHoEMjIiWX8exrRZlg6Yz 7ccIbJ1V0v5Oyw9lUwvfv2/DyYJahAu8TAN/0bNDq9tI8mg+uLw9Nzyk1p3mf09od6ni le2MEu+B1bzaKdzsAgFkQGZi/kTjY7fdi7EB9Ia+QhSNbx6Yhzsf55uBgeePHf7He0+w PCNbD70WQcBlv+OJE0neLbq+yEMrViIoSLGX27mZLtNYdgkuAgu5SrKUwipR3n5Gvo5d FVpg== 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=EcIyQNQGWZpssn92QRUwuCVsqxG97cEylRMeWxJB5FA=; b=qRQX+6cMcNmR/jkKl2ecZBZriaPtqNQYw8ktBBYsgJ3aSOXFk5i6z+wv/pnNxXppvH rx4vMsZoiqH1eo0GBWxjnd/xj//aqcFHefNq+1RWsx7m/d8pZCxzmqv6nB1PSQ1bFOsT Xf3pzbwWPO7GuOMj4mbMf19/qmLtDYn/zP3RJlYXnw+nFdamfYys5exR7aVzagWcXqbu 2n0IMAJyfEM5XMYvqYxIyEJByjLnADCffZ7lQC6qhP0E0uUrGCAYza1vIvO8AQh+vqnm gt2+Ol6w3Bc9dwqorwqZEIybPZvgaGUzrnOzqJLpcRf5ADsqEfNoxDS0Xp0hibfmRpa1 /ldg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cWujCKLB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id q13si20070pjp.54.2020.11.16.09.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cWujCKLB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 6A3F36E071; Mon, 16 Nov 2020 17:37:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 665096E04A for ; Mon, 16 Nov 2020 17:37:44 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id m6so2457320wrg.7 for ; Mon, 16 Nov 2020 09:37:44 -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=6Szxzlxe07MDq6GBf9WMTaGmfQZg98jXh/8U8Q7NRl8=; b=cWujCKLBBVgUQyRuw5USqQWff0TcZh9I2YvP7MjQJxWb76ShqJ+IIoOaTqiIifIUew 3dmTGfDKzlLil/pvr+g3YM2kyz7IPMyOlgZ3Hpuz8UQNNQSKtZmQRyxRawukvN3mzNnW go0QG1im5Pw9V1O65u+trn3gHzHTCbxX4uMLMVodj64bU+Bq3St5yZIvclTzBB+BR3xr pFPv+kFHHilL6Y6XXtL71jf+P4dcGPbkpHMp0wJzQt85DUSg8Q4bo523tThzUHDK2UCT J4w2a3gB2yNwrmIx0rCsCSDi4Pg6d0LUMsRtAq3Tv1Nnzj9Satc3yADiahzAj1Ix67ZK fy3A== 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=6Szxzlxe07MDq6GBf9WMTaGmfQZg98jXh/8U8Q7NRl8=; b=Joxsv+d/WF/pb8/yOeNYui3JeZgTHf8Du8HWVEmnzmrxOpqyPQIratGt5sMcGfCIFx t7qQoYBxFR4US7jCITGuZ2LFzJa3UF38OmcgrW0j9VePaElY74rE1TNao95IkQtE4tGD tiSMwGuFolyMSmEy+zcOXUrArggtOWiYQMNgnhP0Zsqi1+3GBDFpY3/QZTtNbQqZdy8a 5TaB4WhQ79+Nkdo8uzvJ+dvNMRstrzMNc2RC6up3JOeV74vWZS2FR0mr1UmCXxkQXouF 27Hd+DuOsrynWzV1FGm+2lNhvAgCnmts//jUR7oSKqoK4jht3X9JHsRc7tHXxyrLaSGw Z1MQ== X-Gm-Message-State: AOAM533Fn0E4Ib5pID1U84MkH+DU8pU3mzLG1vikX0LVbzrxYgflV0mz 0OnucYYLH4sXFrd6NX0hKTgrQw== X-Received: by 2002:adf:d18a:: with SMTP id v10mr20186934wrc.325.1605548263095; Mon, 16 Nov 2020 09:37:43 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:42 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 28/43] drm/radeon/ci_dpm: Move 'ci_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:45 +0000 Message-Id: <20201116173700.1830487-29-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/cik.c:1868:5: warning: no previous prototype for ‘ci_mc_load_microcode’ [-Wmissing-prototypes] 1868 | int ci_mc_load_microcode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:5847:6: warning: no previous prototype for ‘cik_enter_rlc_safe_mode’ [-Wmissing-prototypes] 5847 | void cik_enter_rlc_safe_mode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:5868:6: warning: no previous prototype for ‘cik_exit_rlc_safe_mode’ [-Wmissing-prototypes] 5868 | void cik_exit_rlc_safe_mode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6286:6: warning: no previous prototype for ‘cik_update_cg’ [-Wmissing-prototypes] 6286 | void cik_update_cg(struct radeon_device *rdev, | ^~~~~~~~~~~~~ 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/ci_dpm.c | 7 +------ drivers/gpu/drm/radeon/cik.c | 1 + drivers/gpu/drm/radeon/cik.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/radeon/cik.h diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 8324aca5fd006..a9fc0a552736c 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -27,6 +27,7 @@ #include "atom.h" #include "ci_dpm.h" +#include "cik.h" #include "cikd.h" #include "r600_dpm.h" #include "radeon.h" @@ -157,12 +158,6 @@ extern u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); extern void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, u32 max_voltage_steps, struct atom_voltage_table *voltage_table); -extern void cik_enter_rlc_safe_mode(struct radeon_device *rdev); -extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev); -extern int ci_mc_load_microcode(struct radeon_device *rdev); -extern void cik_update_cg(struct radeon_device *rdev, - u32 block, bool enable); - static int ci_get_std_voltage_value_sidd(struct radeon_device *rdev, struct atom_voltage_table_entry *voltage_table, u16 *std_voltage_hi_sidd, u16 *std_voltage_lo_sidd); diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 980b50d046cbc..ae020ad7b3185 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -32,6 +32,7 @@ #include "atom.h" #include "evergreen.h" #include "cik_blit_shaders.h" +#include "cik.h" #include "cikd.h" #include "clearstate_ci.h" #include "r600.h" diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h new file mode 100644 index 0000000000000..297b3c1ff804f --- /dev/null +++ b/drivers/gpu/drm/radeon/cik.h @@ -0,0 +1,33 @@ +/* cik.h -- Private header for radeon driver -*- linux-c -*- + * Copyright 2012 Advanced Micro Devices, Inc. + * + * 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 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 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 __CIK_H__ +#define __CIK_H__ + +struct radeon_device; + +void cik_enter_rlc_safe_mode(struct radeon_device *rdev); +void cik_exit_rlc_safe_mode(struct radeon_device *rdev); +int ci_mc_load_microcode(struct radeon_device *rdev); +void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); + +#endif /* __CIK_H__ */ From patchwork Mon Nov 16 17:36:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324461 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503655ils; Mon, 16 Nov 2020 09:38:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwceLEH5wcMV9BkaVRtsGz0asAoJEb3f/ADzj/iWpvrTlsrwLfxp+G202mCGtJNdFz4X3qO X-Received: by 2002:a62:fc8f:0:b029:18b:823a:13c2 with SMTP id e137-20020a62fc8f0000b029018b823a13c2mr15259834pfh.57.1605548290484; Mon, 16 Nov 2020 09:38:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548290; cv=none; d=google.com; s=arc-20160816; b=fT5NWqAhs142XN9YH++ejYTMHauvFHPN1XYh1j656JHcemf3TqYR1/t1nYFs6dFtR5 ThTdz9r7thLLVlQvXuofNP9aKtveVS1HleLu+YHBWqCyMkawJ6KqD/LK2ciRppHi3+X2 dU+XZ5V9XE8Qae2gPnXNX+PMmAK+m1tRzTMGk/v7jUDDqzDEtiTE2u2VXYgLF/Ltck83 j+4l38hPWqxgnhk/BVPCp9XBScVWmU3HBaQPaldFl/6QI4p+l9jmFZ9vloC4VwuYd/WZ 9zhS9fRwofZ8fnPwDvD6sv4RLXUoKWZIkHWmydldeU2+n5HOVTIofGYB0kxkD3sKsfpF DY5Q== 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=CW3N7dO4cIwmBneAW+Eyd9/DO5QArtlCBhRp+yTa6u8=; b=VmxRb6dVyyYvMB92QWlgEAo0cchzJi0CRY1e4MpN0ny8cvMFZctTkmuxZit2aofA26 WtGZsX1LYvIvBXYGsI+W84Pcq4XG69STOIIk2PXeargcYCYJjaXzzApFKvdjk7Bx9ix+ RzikTOdJAIYo8NrfgX4DKd5N12UL+LYD7AsYsxqOxjmfE6DrblnRSgjQ4ig4PyL2LVGE 5MCw1faNJ+IDC7VNIOziYeXrgmdqi9GQkiqQo0H3Pc7THu/BO7s5MSbARn6Av9vhkYGB FO57c29dagYuD+WuDFtINXlRCR8hrfw5rUcU/yRr7xojHEVblQuT0XrVUhG8XBfhMGrq Vt4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=sfgrxMG6; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id 143si15802426pgd.40.2020.11.16.09.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=sfgrxMG6; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 170506E092; Mon, 16 Nov 2020 17:37:54 +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 9749C6E04A for ; Mon, 16 Nov 2020 17:37:45 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id k2so19680554wrx.2 for ; Mon, 16 Nov 2020 09:37:45 -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=F+vpUFKiF0HcP1zSRTFbAOX8pFoOA6PVK8Wzkj+zQXI=; b=sfgrxMG6CmVvxPp4PJ5OjjRHPczlJjKdH29Zymx3hfYfE28kkaxjfDWAx0nuOk+ddu ewVWB5vaa58WzoSuaKOe1y49Hirs7sGkZqF336HJXZqwi3+TilGnTvhmW7jNA+MmJVqG JQK6/e26iVfnIxjfwdOu4dgSMMxubz6qKpAu+soYAhohpvOFjnUIwxArHRVpuLZSFunx Sgee/pS7pRG9DTBsJujcROkhpOINwa00CJ6ZoBCiwcxI3O+iWhzxws4OjIo8XDqeSMSR uROJx71BUPkebIoSl/3XMWCrOKn+QNPS3p0MHC7DJqKD9yLppbd8PXwlGPpEP31XSpWa 9b9Q== 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=F+vpUFKiF0HcP1zSRTFbAOX8pFoOA6PVK8Wzkj+zQXI=; b=b5BuZWcXtWMmYHax6GydbtxwlserPIVoS3dPb4gspvXnsJmv48zpGHW2zmjFxPRN5V aBQuuP69zU8jTmxlvQWbMXjE186f6gBGSw/Kn6cwJp+1wvb+QD985ePWubxm/dL7Ic+J 2zFn0Ey932dtCkq6GkUJFOzWXpTWgZrXjfcPBjZlHi16seaqmsPOsHMIN8Nw98P6NsWF YXQErTTgSBSNMx5cKNa6PSlXdTaj0cgUNCa7u/QuNVS7WQLMVWnDgUKnhWI+PgUTGLcn AHky9USreo8sGKkfjQsyPlaio3E4/VxDDTuO7Wm6L1HG7GzF9KiJ2zaNop4EZpCfopvP uYHw== X-Gm-Message-State: AOAM533KOVikDMzd5b2SPCYkN52dOBJV5lsi6ofbuOVHLwsOeDJq30cy 2rpSRu4bAA15SNWPs/SwLnNldA== X-Received: by 2002:a5d:488b:: with SMTP id g11mr21841442wrq.210.1605548264298; Mon, 16 Nov 2020 09:37:44 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:43 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 29/43] drm/radeon/si_dpm: Move 'si_mc_load_microcode()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:46 +0000 Message-Id: <20201116173700.1830487-30-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/si.c:1570:5: warning: no previous prototype for ‘si_mc_load_microcode’ [-Wmissing-prototypes] 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/si.c | 1 + drivers/gpu/drm/radeon/si.h | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/si_dpm.c | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/radeon/si.h diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index d0407145c07b5..88731b79c8f57 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -39,6 +39,7 @@ #include "radeon_audio.h" #include "radeon_ucode.h" #include "si_blit_shaders.h" +#include "si.h" #include "sid.h" diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h new file mode 100644 index 0000000000000..0a5018ef166e2 --- /dev/null +++ b/drivers/gpu/drm/radeon/si.h @@ -0,0 +1,31 @@ +/* si.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2011 Advanced Micro Devices, Inc. + * + * 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 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 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 __SI_H__ +#define __SI_H__ + +struct radeon_device; + +int si_mc_load_microcode(struct radeon_device *rdev); + +#endif /* __SI_H__ */ diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index c68ab2fb1ac23..32b697965c064 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -32,6 +32,7 @@ #include "radeon_asic.h" #include "ni_dpm.h" #include "si_dpm.h" +#include "si.h" #include "sid.h" #define MC_CG_ARB_FREQ_F0 0x0a @@ -1721,7 +1722,6 @@ static const struct si_powertune_data powertune_data_hainan = struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); -extern int si_mc_load_microcode(struct radeon_device *rdev); extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static int si_populate_voltage_value(struct radeon_device *rdev, From patchwork Mon Nov 16 17:36:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324468 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503761ils; Mon, 16 Nov 2020 09:38:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJz24wEq7ui4q4m8cZgYcRuPLA/tgMZ6n++IIFbdjBxeYaI6lY5WFaAmZbiex3cfHeSm95Am X-Received: by 2002:a17:90a:8543:: with SMTP id a3mr17368268pjw.13.1605548300079; Mon, 16 Nov 2020 09:38:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548300; cv=none; d=google.com; s=arc-20160816; b=cJ3q0tkcp/4DbDxON1bjHknO089PEz+QJ7aLjEqOASKX6rCn/qUd/HD8BAdS4EdSzO /rNPtWPHD7h2bylS0Arf11Pa3zdFCI04zHixP84Uy0gqZnkX93SlcBX1ctmVWYN4hGBW 31e9BGsK6KYfM4g/jq6B9nHCOmRhpcJW+XVFeWcYDVuz6UXQ5zZTFDYCGdLMgdKLbUzT LEGeo7yWFcwf6H0WrlWJBFhYi7osajurBlOLM30NFSuHoC3+0vNgPCdiMchFJU8q4LXS 9HXZYcTvyA4l/OWxIwbBg6MJ1Em4C25yGZ7fW/PhisJUfMbsDv0QCoKnU8REA/GGTjcT ySIw== 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=/vG4QIOIHXu8r0wjf6NdbTXJ+rxIJerAhRoXgWeh2/A=; b=pFJqvULUfAFRdQHTCke7ZC8pRYrSN3l4X5HEd3oZm/xO41fqn5dKlGpeR2KDw4l2t7 K+48pIfrL1Vyw8S74aRu4TJjKr6LnXufhh3PxoBzta6whFh4HvFB0JkCQZO8kXeAs5Ft Gr9Swx4egx1u9/6OFg021xhA7s/tPZ9z+p/aTlfFKiG3pO5T41XHZJcbFamRkvdvcN0P Oih0MhxoMY4Z6B6MRr+e7dF77gx1Y/y1ZaA33J78QKoLXahBAE3+PNL0YZBC+IfYTW/T tzdGezA2FKe5ZUPIHFmBaxqevnqbM1Qs70iYPaKQyyjTxYiJVqQMqB0yF2QnYpe/9FX0 VeZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=H9fzVUYr; 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 b23si3469369plz.230.2020.11.16.09.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:20 -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=H9fzVUYr; 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 132746E063; Mon, 16 Nov 2020 17:38:18 +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 C27F66E04A for ; Mon, 16 Nov 2020 17:37:46 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id s8so19610987wrw.10 for ; Mon, 16 Nov 2020 09:37:46 -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=c/TaDkB9aPGP5jIvVTMt5uJ/KkWKg3o08L440ECaIrc=; b=H9fzVUYr61GkdepEkcKo4chSq6TsD6cuRJmXdrsP+VjRRNEvOQQX/IfJ52sG/AWhsh EFRdfq3Dlg+axrP3DhsmqLb4m57yB9TVKIKxsJ0uDgUZORWETCnUubh/cXsWl8zsxOQ1 o/9J+jM+JTAJ1opy/ZR2C8WKVu8T394xmWN6haS6//h2fksNKepH0hCF4L0RS7i8WIS8 ThriN6lQhbMpGbEIWYKuT4VANbahux5F81Q/wy69QsmKqF4kktqGd/gfP9OhrIEd5Iz/ RzpxPw7HF4e7VfvvQLuSrr+A8vSFJPkA+FYLvcXnilM0rbX07wqAzzg43KI8MMoxUt1E BEwA== 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=c/TaDkB9aPGP5jIvVTMt5uJ/KkWKg3o08L440ECaIrc=; b=FbqKx+b5GJ7+NWK02ROSEZBvyn2DsO4KzaXLtRBREnN52dor4511MHhQ9fUch5yeK+ 7hPfKroUleSxvtwGbgnvF9Cv5VzPFhfIezcBwl2D8xDZs6OuXBSkSoQfLY+SiKKq46T2 U7/D7lB+46IOGcF3XV1MbGzD9vDQ3Uy2MvgfLNGtuRJPjv7whEzBuuvE3bbhfS3DnGmE /SwgyD04VVgLkX91PCqRPC1pBs8KbLulLOQihQ2yoSMpMs0CLnBFvZstXPClaujsVnfn Kl/IkADOM6cZRepZUPwAc+YV4C7shE11psYxRLBa8Ls2FZo9m+ToXgRq8F+7qbmSkLfh Y2Pg== X-Gm-Message-State: AOAM531AEHHVZo1MQ3now56iX5WdtKSgun02JuhbLnyu9gczyDYgHAs+ k52gCoNJmYpS1qqG+lRjhtYBXg== X-Received: by 2002:a5d:4612:: with SMTP id t18mr20438262wrq.401.1605548265478; Mon, 16 Nov 2020 09:37:45 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:44 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 30/43] drm/radeon/si_dma: Move 'si_gpu_check_soft_reset()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:47 +0000 Message-Id: <20201116173700.1830487-31-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/si.c:3768:5: warning: no previous prototype for ‘si_gpu_check_soft_reset’ [-Wmissing-prototypes] 3768 | u32 si_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ 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/si.h | 1 + drivers/gpu/drm/radeon/si_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index 0a5018ef166e2..a1751ae560f02 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -27,5 +27,6 @@ struct radeon_device; int si_mc_load_microcode(struct radeon_device *rdev); +u32 si_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __SI_H__ */ diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c index d2fa302a5be9f..645897d1bfc31 100644 --- a/drivers/gpu/drm/radeon/si_dma.c +++ b/drivers/gpu/drm/radeon/si_dma.c @@ -25,10 +25,9 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "si.h" #include "sid.h" -u32 si_gpu_check_soft_reset(struct radeon_device *rdev); - /** * si_dma_is_lockup - Check if the DMA engine is locked up * From patchwork Mon Nov 16 17:36:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324460 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503601ils; Mon, 16 Nov 2020 09:38:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGu1IOtBeuDmjzjV27rM8oOfvdB6pFpdRIJgR6G9gPoCkcZNCZHrBYV1R2u/DVRGNU/x39 X-Received: by 2002:a63:1822:: with SMTP id y34mr288774pgl.218.1605548286359; Mon, 16 Nov 2020 09:38:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548286; cv=none; d=google.com; s=arc-20160816; b=YC1oW5pCcDkh6Rt8Z3R+ikqEAwFWzrTKE+G/fVhKDPf6kJsqXs5eTQNs3oPlUK6vL1 8JYiAURl2WPHTacLZUB0xv1qG3RnWXZP/sXxX3jL6OcYI7TVbGSI6e+iKYuO179s/Jwn KCiFKynkcrfa10gJKpXEYcCZotlQ4pmTFDxiOpXlUUuK2qhatQEnruqAPJ7s1PYvg89i CrE0ARgeZoGeP82x/6fAHL5Fe2FfuCOj4+1zxrabBmNMk+aOO+24koDnPaZlDWmCnEa1 udJ1WzU9VQXVNo0DjFa8NZFh1uMTqOYhAyo2+mAfRhly7fx7W1YzJxsipgDU9MUyIDJv sX8g== 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=dszNSZ4KRAEvQnahZgBeVuqnFBLnNLjexlhj+sdWBMw=; b=eB1cEUwomjWowqzieftHmCMTGs2OCQor8f6i/e72p1a/M+6JXfLWChQpe2D/2kiLjl gTGQ5up07JRgiuJ+vqKqZFmwmy64BciKzvETLhlC9uDeRqJtQxbYxLB8xt7lQ+ZpgVbI rvAFVtmbCxHE0C8348zpyJd59WsawGg9zv7oSVC/Wg3zp807Bdedh649TvO4CeD5n21P kYNAdaWsjSmfsyL61YdV7wLKNyIEjVhvMna6WlvmBM88AIQWaCTCOoe3LS7XHwRY6+kJ +bLkjRBnDHt/2wV+P3S1IvHgS2wBBRQGtcxZ+mejLLk34bLMJH+oUx875Gsb0FSAAUCH AuAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TFBPvHxi; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id z134si16828418pfc.137.2020.11.16.09.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TFBPvHxi; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 B7BBD6E9A0; Mon, 16 Nov 2020 17:37:54 +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 1C1D96E04A for ; Mon, 16 Nov 2020 17:37:48 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id d12so19598652wrr.13 for ; Mon, 16 Nov 2020 09:37:48 -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=a/Zj5V7ntHFWoK7hDL0KY4UUjT17GXd4P0At2oNvDPk=; b=TFBPvHxiNg0J66sXloeHlwrOB5eWbndg3GWxnxNUY/l85QSylm74QsaOu6c9V0sLmG gsrnImQVGr/vzI1O7BgbeoRNaysARDN0yLvRIL+qaCWtSVIL3Dki7e9FEDW8asTZVwZ6 +KbfAcOKEr1hxQUuXN22cD2h5KNqAixBIbRYq2Qf8CZUofHYwO2YGcYYuXget9TsJXwS sSWUlQBWfMX4tksJumaQpklKT/jTnTL3slInD2HfyyF2gVExiphw0nn20uXiUWBwEc4T 9naALP835/24p4ry/5XCk+jssfHvQcCihUPctJQpGv51yNSp70AKMXPK/mHf3HRNuU1n 5s4g== 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=a/Zj5V7ntHFWoK7hDL0KY4UUjT17GXd4P0At2oNvDPk=; b=Kqur1M6ogquHgl9CvSoO7VfLnzWkEJZN+N9GvBGtKkrdaYAe8ou3WxnZqhB0nEzrqY xVHjSAfQsFjCWcmGoagbjUfRCmmkaCuZpzre7+y1pRuJHBjdZlEGuazncPV28kSWk7t4 pbI88ztEfKvfnfElKGk+dbCohr2wVVunE3CSeND7mJPmfedRTVQlceeG0z+b/TLLbxu2 uIKP2HEpHvVlMXwi+hW4MaXNGWDxomQX1gYOZ2iRkVXyv1vn40CDmyBzCmfq8VCXfM9p H7DSOj3BLFJnFJEWRXFxYxc7qCLW/Dokj7yMablxS1Tqee3Om2o5ommGJCRly9REsopN Ytcw== X-Gm-Message-State: AOAM531k14k+uzsX0puK8Wd0dP3IaLiJ2fChWRG6P4xUIWhaSRCOZepf +/WEL8wPWM0g1siT4O/5kdU47w== X-Received: by 2002:adf:e512:: with SMTP id j18mr21789945wrm.390.1605548266827; Mon, 16 Nov 2020 09:37:46 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:46 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 31/43] drm/radeon/cik: Move 'si_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:48 +0000 Message-Id: <20201116173700.1830487-32-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:4186:6: warning: no previous prototype for ‘si_vram_gtt_location’ [-Wmissing-prototypes] 4186 | void si_vram_gtt_location(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5186:6: warning: no previous prototype for ‘si_init_uvd_internal_cg’ [-Wmissing-prototypes] 5186 | void si_init_uvd_internal_cg(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5801:6: warning: no previous prototype for ‘si_rlc_reset’ [-Wmissing-prototypes] 5801 | void si_rlc_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/si.h | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index ae020ad7b3185..cef0f3111cd3a 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -40,6 +40,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) @@ -127,9 +128,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); -extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); -extern void si_rlc_reset(struct radeon_device *rdev); -extern void si_init_uvd_internal_cg(struct radeon_device *rdev); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); extern int cik_sdma_resume(struct radeon_device *rdev); extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index a1751ae560f02..f483a64d17050 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -25,8 +25,12 @@ #define __SI_H__ struct radeon_device; +struct radeon_mc; int si_mc_load_microcode(struct radeon_device *rdev); u32 si_gpu_check_soft_reset(struct radeon_device *rdev); +void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); +void si_rlc_reset(struct radeon_device *rdev); +void si_init_uvd_internal_cg(struct radeon_device *rdev); #endif /* __SI_H__ */ From patchwork Mon Nov 16 17:36:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324456 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503512ils; Mon, 16 Nov 2020 09:38:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7LJCGyaNdQDkotuhctiKRuOUdKOORQaUkRGTwndK5kgS2Kdqrhyj+++hhXTOLS1xi/bZT X-Received: by 2002:a17:90b:3687:: with SMTP id mj7mr17207888pjb.143.1605548280609; Mon, 16 Nov 2020 09:38:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548280; cv=none; d=google.com; s=arc-20160816; b=SFMfT0sTz7p5IRGvCsP9+b15NNdYSyQ4545/KbFqbGT33Qg2AUS0mir6g6ESZmJn4o P0O/DXWZbmFchsJXC2r+5cpiCJM0VMu9VLXRWAu+48sydBvGbtMMP4gQwO8HwM0MBTQ0 lHqOTOquW3PlydmLw8ouY6qgi09/EcRwN7bdbYX5VqNJhlfHyuTOZQyyrMDTkBreG1ml bngumqSzu0o40Yx1daQ0kJ1xmQc1moHzOeeg+4TebHtlRxzBssEhKmdVyqWAL2i0eUGD uGgawcUW3wil6n08Swuml3X8SV2pknjphILnt8oy4t/IXNK8+wK38nSqd+Ly0m/KsVh8 FQSg== 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=F5fslplSyKWklhTSeMS3mx7UbOsJnD1yCRg+7LEIcAA=; b=uflHa1WbR8SgNXa8Zgq79NlDqxbnOx3K/C+2f+6ic9S43Ucu50PKaMoNNxuehhoY3n 3AS9JUdiT52AWkeSkMeuubK755Ci427Tkz1NB+Yx0EXB7EpQw0qJBlWOqjmdOyvEj4TT Tzj/xbPTPVdqm0TsLfguC2AnvPklQb+OxPH9tNulj9z5lD3KCfDFF+uzDJqHN1uuP1uv 2BtArK1vmb52MdPlDaeN7Eb3kSOi/Us+DGz8Cew+eW1ys/fyZI6Z0OIxMP7g5NiCEfya CLc7+7thwoF3OZl9xBv6WLP254J1yWNhDffQLMOOVSfH1yk+iZJQb5gZnpDkTN1VWzHD 2nHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=rDoz2LOD; 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 z25si11668538pgk.85.2020.11.16.09.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:00 -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=rDoz2LOD; 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 BC1BD6E064; Mon, 16 Nov 2020 17:37:52 +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 7F2416E067 for ; Mon, 16 Nov 2020 17:37:49 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id l1so19622936wrb.9 for ; Mon, 16 Nov 2020 09:37:49 -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=wQLiBxHM+lzm9ozhMmLXV+2+mYaIBz41oWImWz9w9hM=; b=rDoz2LODwdktvJ9Y9EB13KeCm6PWI+1JaZSHYfxn0zExBSUAYcFF3Lk6Ktpw5Vwga8 aL0QXnr6CBahNfjRD5G4eKtK79HrTR4hmKiITJdzXnS0ED9XlTb2mt0hJeqqOcBwxmeR 05rnsgHtTUluKUDpP5sJhTd0r20O3S6oLrlgydUWSzxOQfL7knsKgSvaji3bHKLYTqHJ FvK5gDN2dVmttG7hb8l5OFk80iq7QiJ3jDsFhiGAEhryWjHOc+L4L2KVW/kUCftYR/yE MVyBHd1SJt/+YU3LZD24rx8hHt80lCb5WQ4tsk9PtPfzNzGI51M7c/IeZIR5U+Y2eTem nWfA== 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=wQLiBxHM+lzm9ozhMmLXV+2+mYaIBz41oWImWz9w9hM=; b=JQVWv25cU9EgmtopvlrfDILC4yGY5yDxscjJdFe6DEyhzl0pkHdYYK08Xz1hQ3ytiX RkwufHboBFbRE2zvUOpvP5JE2k0+bvseBwzml6kOqGnXx/bDA3aB07HFHsHNNYt0S/KB lR7OL+8M5tZwHbnWtbk1FPD4bw6PikLJozL19plf7FRw9Qq4/tXliT2STepztYEZ+BFj mrF+a3ffKbO74l2jFETjjzgK/fqiAP/988pOY8Vq2ah9ZskYzSlOWJd5AVxFZ5HAHdEa CWZD/lYBcgHjsn1gY3+3jcq4SO3eOuSmtLBl+cGlfwct34DyNG4PJgzYKsPnTT8Goyai pifQ== X-Gm-Message-State: AOAM532T6ZhnnqnOWxNCRYtFIYzqTSw4bWlLiw5T+vEHIUXWr4RUPFku q5t052JTeOo1/k8MqavSgpjX7Q== X-Received: by 2002:a5d:5342:: with SMTP id t2mr20141378wrv.243.1605548268198; Mon, 16 Nov 2020 09:37:48 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:47 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 32/43] drm/radeon/btc_dpm: Move 'evergreen_get_pi's prototype to shared header Date: Mon, 16 Nov 2020 17:36:49 +0000 Message-Id: <20201116173700.1830487-33-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/rv770_dpm.c:62:30: warning: no previous prototype for ‘evergreen_get_pi’ [-Wmissing-prototypes] 62 | struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~ 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/btc_dpm.c | 3 +-- drivers/gpu/drm/radeon/cypress_dpm.c | 3 +-- drivers/gpu/drm/radeon/evergreen.h | 2 ++ drivers/gpu/drm/radeon/ni_dpm.c | 3 +-- drivers/gpu/drm/radeon/rv770_dpm.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index 018949668536e..4e64ed38c439f 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -29,6 +29,7 @@ #include "btc_dpm.h" #include "btcd.h" #include "cypress_dpm.h" +#include "evergreen.h" #include "r600_dpm.h" #include "rv770.h" #include "radeon.h" @@ -49,8 +50,6 @@ #ifndef BTC_MGCG_SEQUENCE #define BTC_MGCG_SEQUENCE 300 -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern int ni_mc_load_microcode(struct radeon_device *rdev); //********* BARTS **************// diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 6d3690bcca2d2..fdddbbaecbb74 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -26,6 +26,7 @@ #include "atom.h" #include "cypress_dpm.h" +#include "evergreen.h" #include "evergreend.h" #include "r600_dpm.h" #include "rv770.h" @@ -44,8 +45,6 @@ #define MC_CG_SEQ_YCLK_SUSPEND 0x04 #define MC_CG_SEQ_YCLK_RESUME 0x0a -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev, bool enable) { diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index f8d772e612a48..a829deb8b078a 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -29,6 +29,7 @@ #define __RADEON_EVERGREEN_H__ struct evergreen_mc_save; +struct evergreen_power_info; struct radeon_device; bool evergreen_is_display_hung(struct radeon_device *rdev); @@ -49,5 +50,6 @@ u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); int evergreen_rlc_resume(struct radeon_device *rdev); +struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index d39bbd9793cc2..dd5ef64937230 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -26,6 +26,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "ni_dpm.h" #include "nid.h" #include "r600_dpm.h" @@ -720,8 +721,6 @@ static const u32 cayman_sysls_enable[] = }; #define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32)) -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern int ni_mc_load_microcode(struct radeon_device *rdev); struct ni_power_info *ni_get_pi(struct radeon_device *rdev) diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index badd8ac6e038f..ef2f1a048cfed 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -30,6 +30,7 @@ #include "rv770_dpm.h" #include "cypress_dpm.h" #include "atom.h" +#include "evergreen.h" #include #define MC_CG_ARB_FREQ_F0 0x0a diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 32b697965c064..b4581392fbce9 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -26,6 +26,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "r600_dpm.h" #include "rv770.h" #include "radeon.h" @@ -1720,8 +1721,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static int si_populate_voltage_value(struct radeon_device *rdev, From patchwork Mon Nov 16 17:36: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: 324465 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503623ils; Mon, 16 Nov 2020 09:38:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/7yopf4etHVL3L3YFLzKO4DmiAqwzHhf9PJvC1cbvkFu0Kjcc6fHFLQumqKfw8eXsNo0D X-Received: by 2002:a65:420c:: with SMTP id c12mr254173pgq.53.1605548287766; Mon, 16 Nov 2020 09:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548287; cv=none; d=google.com; s=arc-20160816; b=Stdwsq5mf1z/REu0Coa8nta6Nn97w9HPxLf1kbdd81rQQIv1RvfrsSoWFfhST9b2eB pxRpoXOC8mDZEx7C46ElO8YTt/EsBGsniAFn4gTQTQDCCxd5hd/iXuqNJ/0fr9bhLY89 3/Pu+t8RUAwgmFro0SqNMLB0egAvc6FGVEgzVqwt8E7Oe5EHDWCcATXwrFEu4SKYLHaq ESi2rI4S3qmvhqsQD9pgUcHyQ9h1R9ihIZW0XQge6P+bMD3Otq5dugODMYTnfub/gDnr aaavnZ6UVYHZaXHp5f0emb1TfD7nXA0JS5jd0K+842cCMa6/HSmTb1amceS5q96F3ote aiyw== 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=aB+vXRSe3/Je2MQBsnrw07ZLT9mkzl8KaHGP9Luq5fM=; b=CuqGcFATQAVNEIp97hklFlicfJ68JeVfG3VdXGzLYIHe1YSVK2bAmvJEa+fPldPzco ZGsDQRJ4rVVTQjqAQ1AfUYJmURMHAMa3nqxaMFDGUgSqYd5azpLUx0b+iMFSXypJsHWo /5ay8W6k7cmYLwuF7EgNc7522OSgULcwN54AgnEdVaiulvBzxQN5S7DS99QLcGAnKFrw Cs5k6UYhrrQMR5pp556HY71Tr9eSZC3bqOCtC6J4iV7UZWADAGHUVkrbSUV/Y7D2LfTm ZByzKeZt5Imvmehj1umxRZzKvsNLZwgQSrWokse3HuGmlbEciiZyco6bM90igXkhZ6bj 4amg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dijXs9Qi; 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 g6si17140851plp.197.2020.11.16.09.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:07 -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=dijXs9Qi; 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 EA7636E9E1; Mon, 16 Nov 2020 17:37:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id C64A26E061 for ; Mon, 16 Nov 2020 17:37:50 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id d12so19598923wrr.13 for ; Mon, 16 Nov 2020 09:37:50 -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=iA8Mvpk+iDAEBWD7dp99arFLgzTdygtvzraETkCMvqc=; b=dijXs9QiY2YXee7k4ar4kZpC/iWAoR/rUJaCG/bm3xdVuD56N7C4g2AbD8l6Rg1F5I h/beRtehlTdiOWth53tPXNugomaBdkgnhwc+OIwP2ppTAR82r9TWy+dNU/tvjJ1hryOl F9U4CG8GWwCQFEXGp9TZv0LJOHDnldMrO7yB5HhBCwWZFY2yt1+yiiG8tzrXxfd0PtB4 x/2+eZjAB1JQbGHmZOyi9BmYaLUaN1H29pJ8ejLS2fPn1DIfYotLyuNytcIv0ee+CeKg KWnpaI5bARlLKgtQ61kjceE1PZaRc8z/5iJtMTJ8+gq7T5IuoW2AMHscNnMLssfGLE3/ bMiQ== 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=iA8Mvpk+iDAEBWD7dp99arFLgzTdygtvzraETkCMvqc=; b=hygr4oTca9dthq8ebgzo/cyDQs1elNKsJKaEKANkGlhC+B7AceOxAwhCklVtByv8vE V7EMH4F309iX84RCJTgcLhQkRRIw25vt613832HpjTLlRkkDdacZPrfc1y0OM1ArSqUF DOCJxj1yAiAoZ78OuwqeIN5chX2qJnOOfGXAfqyJNjY95GFlyColLIdjN8t1wfLYO2ng BrcPZmfuqOEOBCcMaPGyTOqdxduUpy1N7q4IdlJH4/JZbW1+ui2lO+Yx7M3/iFEGY5xl iij+m/uSpZPurNv69Okoon03QVQ1ZzMbwFPROQFfH5RtwgxbfQbi2JKkHnm15OwTT6xi uHzw== X-Gm-Message-State: AOAM5306bTh4Q16nmMYdDGiGHwuLqvWxe1+uct4cBP8n4zKTQyGA81yQ QjCZvbjh+KdDDGs1pm+Ey2JFVQ== X-Received: by 2002:adf:cf0b:: with SMTP id o11mr20099999wrj.162.1605548269524; Mon, 16 Nov 2020 09:37:49 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:48 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 33/43] drm/radeon/radeon_audio: Move 'dce6_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:50 +0000 Message-Id: <20201116173700.1830487-34-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 , 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/dce6_afmt.c:32:5: warning: no previous prototype for ‘dce6_endpoint_rreg’ [-Wmissing-prototypes] 32 | u32 dce6_endpoint_rreg(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:46:6: warning: no previous prototype for ‘dce6_endpoint_wreg’ [-Wmissing-prototypes] 46 | void dce6_endpoint_wreg(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:110:6: warning: no previous prototype for ‘dce6_afmt_select_pin’ [-Wmissing-prototypes] 110 | void dce6_afmt_select_pin(struct drm_encoder *encoder) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:123:6: warning: no previous prototype for ‘dce6_afmt_write_latency_fields’ [-Wmissing-prototypes] 123 | void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:152:6: warning: no previous prototype for ‘dce6_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes] 152 | void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:177:6: warning: no previous prototype for ‘dce6_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes] 177 | void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:202:6: warning: no previous prototype for ‘dce6_afmt_write_sad_regs’ [-Wmissing-prototypes] 202 | void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:268:6: warning: no previous prototype for ‘dce6_hdmi_audio_set_dto’ [-Wmissing-prototypes] 268 | void dce6_hdmi_audio_set_dto(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:287:6: warning: no previous prototype for ‘dce6_dp_audio_set_dto’ [-Wmissing-prototypes] 287 | void dce6_dp_audio_set_dto(struct radeo_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~ 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/dce6_afmt.c | 1 + drivers/gpu/drm/radeon/dce6_afmt.h | 52 +++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_audio.c | 17 +-------- 3 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 drivers/gpu/drm/radeon/dce6_afmt.h diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index eec5d7a627388..4a1d5447eac17 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -22,6 +22,7 @@ */ #include +#include "dce6_afmt.h" #include "radeon.h" #include "radeon_audio.h" #include "sid.h" diff --git a/drivers/gpu/drm/radeon/dce6_afmt.h b/drivers/gpu/drm/radeon/dce6_afmt.h new file mode 100644 index 0000000000000..176a538664a27 --- /dev/null +++ b/drivers/gpu/drm/radeon/dce6_afmt.h @@ -0,0 +1,52 @@ +/* dce6_afmt.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2013 Advanced Micro Devices, Inc. + * + * 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 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 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 __DCE6_AFMT_H__ +#define __DCE6_AFMT_H__ + +struct cea_sad; +struct drm_connector; +struct drm_display_mode; +struct drm_encoder; +struct radeon_crtc; +struct radeon_device; + +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 dce6_afmt_write_sad_regs(struct drm_encoder *encoder, + struct cea_sad *sads, 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 dce6_afmt_write_latency_fields(struct drm_encoder *encoder, + struct drm_connector *connector, + struct drm_display_mode *mode); +void dce6_afmt_select_pin(struct drm_encoder *encoder); +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); + +#endif /* __DCE6_AFMT_H__ */ diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 3cc53db04d645..785c23cb30589 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -25,6 +25,7 @@ #include #include +#include "dce6_afmt.h" #include "evergreen_hdmi.h" #include "radeon.h" #include "atom.h" @@ -34,26 +35,10 @@ 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); -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 dce6_afmt_write_sad_regs(struct drm_encoder *encoder, - struct cea_sad *sads, 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 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); 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 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 r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, From patchwork Mon Nov 16 17:36:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324454 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503468ils; Mon, 16 Nov 2020 09:37:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsSwVxmVfAETu79ViK8gGDtpatV26vgDOqLZtzC9jK9GLC5wWDhglWq7RJDYPhGblNnZSI X-Received: by 2002:aa7:985d:0:b029:196:2b65:1db9 with SMTP id n29-20020aa7985d0000b02901962b651db9mr10362159pfq.58.1605548277545; Mon, 16 Nov 2020 09:37:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548277; cv=none; d=google.com; s=arc-20160816; b=YeXgaZpygs4FOTyltp1nXxy72u+njMOPPobg1K/KxH9oGYfHAQejMwqo8LhYZ3vyts rg7xoXvoX/Pf6calY6twIgWxmENg4QYUr07nJzEXy/B/vc9YNLbwLmN+wlL03AsTnV7z NSXBJhO2I0AplHS/eabHThsdwbcvJYjrBfE4pSO6IMwDy+LpMhb3kb2+mSqCxj21sW8s JVt4HpInDS4bGcEwmtSJ61TtNPX3RLEwvq1T+HPfiWs8Ex4eb9vDzPQTjLz2omGYITO1 D4eAtcuHEh+daJjXT77GD99cw6OM0ybbVhcX6P613jgFhkG1MyQxgUTWQ5HOZmOTEiFG r4cQ== 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=S+/y8l9QuSYjodldnlU6z9Lfojyj476Sm1ILh+vhcO8=; b=q5b+LM3y+wAIr+kGKsJ1zM9Sb/Hc5m39kK5NbX6OXYxPh7vV/KO/tbnjeswoP3OlJ0 xJ6IKuLVW2n6MveSZb5GNxAYpSJcP1BSCBwLxNCDEMAnXz5lxbAhaQelUDkCGJVugTs+ 3rxY15RjfI9HpRkrLrGmvGqmNWfa879fs5/8Us1cp/4WuS4b4m37xDGdmlft+zP6GNKL 5keTgAhbXXNQDrlS7enky6OIfovaaUZYdKGAti6rXtmSn6n/ijJmmuWjl+6xoBPahn3u Zu3/rWChRPPKwI1e0lMZ28bd3B5lTtBYO8/ddopuJpuMSrArBrH6Zg/J9dqlsiOrrRDN xTEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CdtQ5VOj; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id r16si14773887pgv.552.2020.11.16.09.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CdtQ5VOj; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 CFF136E067; Mon, 16 Nov 2020 17:37:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1713B6E064 for ; Mon, 16 Nov 2020 17:37:52 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id c9so15315wml.5 for ; Mon, 16 Nov 2020 09:37:52 -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=P+jve5cvTFEXukD009ehQU3PqTcAXFynBtan2SGSyic=; b=CdtQ5VOj6GNmI+pVSbK8iXPk9zYqd+dkBXz0oNCMhVjailBPgrsFVQpacvXB/WYg19 gzhUcmBF8H+J7KjFL7KvzmoLPoenb9qFD6KVc7PvQU8cBB/snaOKMeK/N/dn7gNjFcfx TdsEHf61jmaky/RM1r3Mo2K/0M8AegoDlQ77EXQogA+MkGp7qtoAN2le5QjgqDt6c1lE aWyz76mSfCM45dm0sDsun/E22uYtgtiohNphQuWYFfz5xS2MNbbCv1K8xD6jWsQ0SjwN AY2o5IrCP1vFjmpfS6VoAVK8OSAw86fyD0GzPWP9cErsWQ9j69lI9JmI7HNDRF9wEfWp ZFjw== 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=P+jve5cvTFEXukD009ehQU3PqTcAXFynBtan2SGSyic=; b=KlMuAWUWEojaatP4e7DSFKFw2RmHLMYxZNz6ZMsoaiqceVNCqVDMg4ieqk+qc7wMLo mGB0eYrxlvdJGwYQi93SUnolYSj5yEVFdX9X6RKhtFdFOkCN4lVBP6go8OecGYWFTMFB +Xw1uoNiP0ieS85bArUaXiYQWfXpUTj9SzqwAjn3zBb1LA03ipwdjBLSkMwYwoi0zBkX eJ3TqfSRUK6QfmMqYfRw/aS80QEqVZwrdePG68UTGKQD9GKpojuFrBfH/5uQZ/xuXkKS pBYIqKxq9k2VnzbDjOa4cZ0Qi5yWLxMSKyMIqA3p/HcGugaKs5uoWTDZT1jP6UCAhjsN yZ5A== X-Gm-Message-State: AOAM5325fxHBcmvYUwsJqEKKrORpg4okqZg9h2hD4PovhrGRASZq6PQz 905pI0bwe5RU9FX2pkb0jbfdkg== X-Received: by 2002:a1c:96cb:: with SMTP id y194mr21701wmd.62.1605548270778; Mon, 16 Nov 2020 09:37:50 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:50 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 34/43] drm/radeon/evergreen: Move 'si_get_csb_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:51 +0000 Message-Id: <20201116173700.1830487-35-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/si.c:5678:5: warning: no previous prototype for ‘si_get_csb_size’ [-Wmissing-prototypes] 5678 | u32 si_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5710:6: warning: no previous prototype for ‘si_get_csb_buffer’ [-Wmissing-prototypes] 5710 | void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) | ^~~~~~~~~~~~~~~~~ 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/evergreen.c | 3 +-- drivers/gpu/drm/radeon/si.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8fb0b8c3db5b5..4575e448e59df 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -41,6 +41,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define DC_HPDx_CONTROL(x) (DC_HPD1_CONTROL + (x * 0xc)) #define DC_HPDx_INT_CONTROL(x) (DC_HPD1_INT_CONTROL + (x * 0xc)) @@ -218,8 +219,6 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); void cik_init_cp_pg_table(struct radeon_device *rdev); -extern u32 si_get_csb_size(struct radeon_device *rdev); -extern void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); extern u32 cik_get_csb_size(struct radeon_device *rdev); extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index f483a64d17050..310c58376f927 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -32,5 +32,7 @@ u32 si_gpu_check_soft_reset(struct radeon_device *rdev); void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); void si_rlc_reset(struct radeon_device *rdev); void si_init_uvd_internal_cg(struct radeon_device *rdev); +u32 si_get_csb_size(struct radeon_device *rdev); +void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __SI_H__ */ From patchwork Mon Nov 16 17:36:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324474 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503901ils; Mon, 16 Nov 2020 09:38:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKaK9uyO0GiAxJ0oQ69605rqyF350g2x8Hz2gwDhjKfdfekq8DhE4yp+BcWNjifSwDLNJs X-Received: by 2002:a17:902:ed01:b029:d6:bb79:d46a with SMTP id b1-20020a170902ed01b02900d6bb79d46amr14162769pld.76.1605548311335; Mon, 16 Nov 2020 09:38:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548311; cv=none; d=google.com; s=arc-20160816; b=aDX93rPrumA53U6uW99iEFpgZ4GZ4Wh4ZH/5EdPBr3rXWhpv+ysaaLIYWT3ywTojQ6 l4P3KYET+6TnzYIRPu5l+f+HeTjFh5RmSaW16eHlndj8uzFLhb3Ty19ScfRNMIy6HLzy 0kFv2uR+vkQMcoJLoLTxl7mMyqEDR7FsQguA1pgjEeFCqajh9uY+KJkmm13WUSTwMl5Q XK89RTJspLq8zEbQNx0OyyJkYWWYRQWWW2kmUA/fnDJQ9D5DZ/32/rWqaEdAxCl1s9Ws OCdmLSSM9IVcIQxYgzHCta7K1fNO8ZD8GctgUcCGWIDJj3YXd3qDopaDM0gBxIVw2hK5 Ca6g== 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=5YZ7lZtvZphXfu2D0EKK2wNTbEkZ9hIHwSMQwLVbuGI=; b=HUvdMj4kCskQ2GcaJze/jd13YRW10oc927auffkhMrQm4CBGydYrRXKpiawfWIHhcf xH18P3TFN3H8OailuuaKkbRHAJHvGuh/QLCPcmSql7DiefYAbtTq1lxOF218GG8XiHe4 6T8nMtpeo2V+EhaN97ppDQ5qLLuw2vvBMY1uqxXG1Dtatb8dbbZUVtL4SAb+SS+4IZqk +OVm4CCqptnuaQLBNqeivzKipZmKNFRIPA7zeBiOVfEzOUa+j6N92GS/GVraQVP5rj80 +8fUA+CXi1N6IUgSJMypEKV8UkgIuE2asX+oQCe+3ZvzOhnl8TJkqOE2G9aHlvKN8Q9w t7qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DFTBbu+5; 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 1si9941pjl.100.2020.11.16.09.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:31 -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=DFTBbu+5; 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 46F5F6E09F; Mon, 16 Nov 2020 17:38:29 +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 496E66E075 for ; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id j7so19634676wrp.3 for ; Mon, 16 Nov 2020 09:37:53 -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=noNY+SglbM8aEsCCdAF8dY+Y+lbfpcrhUN1CWHwGoPw=; b=DFTBbu+5/taBz5pfwjhg2wGKAOcz772ZE8KKWtmmMpONrvSSKnHUEF6FR+5UjXPlQK XmlgrM5ohKz9h/HLFZcXQxou2oIiaih5t2afZ7Otfj4eqUJz+ClVii6GJ31QOupottY2 06K+IiP5G5Tql72mSEUj5Elt4Zonc+FW5cVsOEaMS375Pw0lb25NVw8jn19KABojYTnO sIvvQE5jz3fGbJosQodyjtGV4pDXBk4l7CjgB7lbA9PWHD/hGoTrLX7YaUy58OBTdG8n uyZSjbl/MOssb5we3fYsnndgw9ANHUUAgPawXlc59hSgBoC/XP5DMqLG24yHn7aduPpK h7Jw== 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=noNY+SglbM8aEsCCdAF8dY+Y+lbfpcrhUN1CWHwGoPw=; b=qBoUKcYwl6djTPi6w9iG4jVYhjVoUPxNzls4Pa4Zf24igMnXkTXS07dtTH7k+sF+om clacY2RKVSaS5SK/gwFDNIrKC6RvIBzy6oMCVuZkAqr1bPsuCRA6B34oZi0aXWPqKM2W OLS7oippsTnnQu5IJ4sgUHNneh9CRnYMjGa3mz/bi03r6jMuF1g7bfIXBuLPorWGdlzl 8wlSOb76Sk8d/XU6UI2GFhM/0/7BMvfYmk7MSW8oT+smHeOnQtjRHLYwT4nqes1LZK6P S7WeSnCRYdaB2XgcRLxfxGbPpoDR6AUPBK8cgoPxKDKAla4e/6TH8cJaeEfQzfUi5gtM cMAQ== X-Gm-Message-State: AOAM530r/I/K2O7ij2WEhUz2X+frqy9seMhuGRTbEWvXw+UBJYXac8Lj fX21PNv3LR/S6vs3L9IZx4xLjA== X-Received: by 2002:adf:e48d:: with SMTP id i13mr19977610wrm.387.1605548271964; Mon, 16 Nov 2020 09:37:51 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:51 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 35/43] drm/radeon/cik_sdma: Move 'amdgpu_cik_gpu_check_soft_reset()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:52 +0000 Message-Id: <20201116173700.1830487-36-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/cik.c:4845:5: warning: no previous prototype for ‘cik_gpu_check_soft_reset’ [-Wmissing-prototypes] 4845 | u32 cik_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~ 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/cik.h | 1 + drivers/gpu/drm/radeon/cik_sdma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 297b3c1ff804f..6630b9da9e7aa 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -29,5 +29,6 @@ void cik_enter_rlc_safe_mode(struct radeon_device *rdev); void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); +u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 3c709ebe8d1ab..919b14845c3c7 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -27,14 +27,13 @@ #include "radeon_ucode.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "cik.h" #include "cikd.h" /* sdma */ #define CIK_SDMA_UCODE_SIZE 1050 #define CIK_SDMA_UCODE_VERSION 64 -u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); - /* * sDMA - System DMA * Starting with CIK, the GPU has new asynchronous From patchwork Mon Nov 16 17:36:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324472 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503819ils; Mon, 16 Nov 2020 09:38:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJymr44S06sskWwsr4lr/EwIeDoPI0RS6Mqot8Oa6+MMrfaTF3btw/n4opmqY8WKNIA5B+id X-Received: by 2002:a17:90a:80c6:: with SMTP id k6mr16662123pjw.73.1605548305202; Mon, 16 Nov 2020 09:38:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548305; cv=none; d=google.com; s=arc-20160816; b=fnucUXTTLFoqoOH3pZd7KLY/8yijYvcoF7K5n1YtkdIQdR58HCbA8oeQN8lqDvD8UA lWGcHVdVLHRfXax32vX10y6bjOO4xXpM+qzpTdUdZ19XdKVaGhmDX23Gl+TH32ghK+o8 9i07Y1v4a5U6iqOyKBaCiMfpo5mcDre/SA580zixJagqRUGryvSNO5jonrtclgxXPrRf pQWzmSfHl6Jll+gKDfDiZXRMirGKhp6rjMQLGDd+oWx8wcpHPOU+v5rbbTSa+86Hci37 rVDgyy4pkDfj5m/I46KZGnGoioFTwussPheWsRQnz5JK/tmKwIysmgB+TsqHQElGsgAo QSFA== 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=m+GXDzjEcA8pProwI+NmE47oVZ5BGao7ylp4CE/Vap0=; b=BLbi6/biXA3N/hXFtyoSunffJ7s13pZ/2zvXpxkx7MjlbKhnKnLpfk0MRkTOM8Ivr/ xsIBh7FZZ/aWb2hLwwenU/Y+FHL+vbPrPT2rt0xhPo90PuvUyskGu71Psl3Q1uGW66F2 Jw6fEn/tlEI5Qjr8FflBpLymZ7aSEf++i5GiNaPwF/49aavCsU9u1Bgds/Hmolr+EBEA H/atTWW2d+kwNp43JnIW3bQ3+o9dfwCQfWPG8rUuVfR3qUABxkDnN5m9Gqe0ThXjiUTl L3r9tQFjmBvAo4+5AkjLt8vuz8qX9TLSJXubQe0DkQJ+GeGr+S0wWIcC4ZOOSBdq1ZhZ oi3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="kH1BKC//"; 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 d6si10890427pgd.118.2020.11.16.09.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:25 -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="kH1BKC//"; 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 275F96E075; Mon, 16 Nov 2020 17:38:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 980FA6E8E7 for ; Mon, 16 Nov 2020 17:37:54 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id m125so22430wmm.3 for ; Mon, 16 Nov 2020 09:37:54 -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=RFkz09HHg8XjVV8DdlQiV5ZmST/9B9izgfFwLsHrImI=; b=kH1BKC//wSZb3AKFDqYNzlpJHp967MUaPmKrCtKH4g9gvuaOhCFOB+bqmmVsBfJp6Y IRFKDFJr0NyQzl1AeiqaSKli+a3YmpMGqWEGze33mB487RpiarUWtucYnXzoWoqpwd7A qx5TQJV2CDRomdZE8xN48p2tGpBgTnkL7Myt/S49GRT4zyEP2KYH/BnX8zmnLGjZnHeK n9uQD8axbidJE2t3gHCmX1lIn++JBHCYOpFyy2kau/q16LLE7DV2v4Ahl/3kMiCJKU76 i60I5VMbQWJkSXUxtjztOUlRblW0zJ9D5hN7FE9Ht1Xh7QJwe0MrDRErQqC/6CA+M+BP u8RA== 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=RFkz09HHg8XjVV8DdlQiV5ZmST/9B9izgfFwLsHrImI=; b=CBiXu74zWo/sMAAzX1DcqN0RO8IMMOB8xuXVRTK1e2lI1E/3Pqz+pkxh2v8PGmq2sA 6va9pAlRyzI8/e5DJqotFLyuIxFaUL2WxiebxAlKFymRyuGqCwnB+ZVlzTK5dyNE73On VhdmfWniBhW5MHxDQl+YI0mrNBCVv5YSle6qwkgMR8V4NOQik9jge+eQuwKmrRvWnWV7 2XjsqGhVT/tbNXVbYZnAnNcjyk7j8gGXRYjoWFFDOlaK0W7D15ISBkCUAljOh3wdWu1S 6ht4+57X7ZkSNoLCAwEfO49eWGb4/JcdzLp4PvyQWWkSCc+XEJTRToJUB+pn8QeOj/KR ohUg== X-Gm-Message-State: AOAM530J9rp3NsgvFX74H69WLz/B+oA5eiDPTAuVkoUQ0eeD9Eqytm9B KO62riBhdUJ7ENT2Ns8OzxPtyA== X-Received: by 2002:a1c:c203:: with SMTP id s3mr16953543wmf.77.1605548273156; Mon, 16 Nov 2020 09:37:53 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:52 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 36/43] drm/radeon/evergreen: Move 'cik_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:53 +0000 Message-Id: <20201116173700.1830487-37-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/cik.c:6413:6: warning: no previous prototype for ‘cik_init_cp_pg_table’ [-Wmissing-prototypes] 6413 | void cik_init_cp_pg_table(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6670:5: warning: no previous prototype for ‘cik_get_csb_size’ [-Wmissing-prototypes] 6670 | u32 cik_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6702:6: warning: no previous prototype for ‘cik_get_csb_buffer’ [-Wmissing-prototypes] 6702 | void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) | ^~~~~~~~~~~~~~~~~~ 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/cik.h | 3 +++ drivers/gpu/drm/radeon/evergreen.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 6630b9da9e7aa..420207d19de52 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -30,5 +30,8 @@ void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); +void cik_init_cp_pg_table(struct radeon_device *rdev); +u32 cik_get_csb_size(struct radeon_device *rdev); +void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 4575e448e59df..8e9e88bf1f43d 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -31,6 +31,7 @@ #include "atom.h" #include "avivod.h" +#include "cik.h" #include "ni.h" #include "rv770.h" #include "evergreen.h" @@ -217,10 +218,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); -void cik_init_cp_pg_table(struct radeon_device *rdev); - -extern u32 cik_get_csb_size(struct radeon_device *rdev); -extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); static const u32 evergreen_golden_registers[] = { From patchwork Mon Nov 16 17:36:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324477 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503979ils; Mon, 16 Nov 2020 09:38:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5tQfWbiOMFTZ/uOqy+0V4hd07d7uPnnQb+o3qOZOb7ac6n4uUuU5jSr8GztaQsycU9Peg X-Received: by 2002:a17:902:7006:b029:d8:cbea:d3ba with SMTP id y6-20020a1709027006b02900d8cbead3bamr13523996plk.73.1605548317989; Mon, 16 Nov 2020 09:38:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548317; cv=none; d=google.com; s=arc-20160816; b=vHi/qudzENSRWl0svS9KmTWRxmSdH5OO+P3uRsg5BuOnWRUHux7ulfWGQPhNjE224A FW1cNr3I8hEibL0mDGwneAk4Cn0AiUoN7iWa7JyTP0k9Qfmck7Y3Hli9fODMxdnu1TEw TJgTmzqKvT8cexFd8yeUYS/SdCwqVUXOYpXlwK+PWOul88PdEp5hKQ/rXwpkhJWJi8q4 18NsXDNdB3ga5Uut5k2jFuMF9ctiHvam4dxjUVxcz8FiXzjpzmQ+WeZK7+NtKGrCT0DK ZTpJiDXlBgsHjXeLbg6CfYKyVitNP34ytVcDC3Sc4wm+uSAKg/GBW7PwLwRJMCGQyimI z91g== 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=FlGyPK/omy08C+vopOIyne38wzKtrtfUFZQ3b0fA9FQ=; b=YluEswOT/vw5ZTwoqJ+JLeLbPOg7h7rvE38R8F4Hk5MLk0FZsr7HjiWyxfWLZ8A2G9 nRuoUz1o8x5L4HYZtBkFV/+BIRQzOauwLbFBVw1mvbw0C7L6qM+Mub9Kyd4PrUFNACzZ 4pnUwEYsP9ENqxBN1FpVTW8qaKiLIw4ZV7cbdk8B1441yECzbndH7rNiKCFCOqrb0H4m 7nenp++YOmAg1s22JJElYZOSDPfDFkI6XEz4PvcFalWITjBM9ZwBZViEA11aVtC9uzaI /0AaRB86mfOHdQSeYDQdOWnpQwPxT+hvM1dQTgpyxMcNHNLJ6UjgKXTpNmBolg5gbhZ+ B/xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PD4ZgQMZ; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id e4si15864069pln.141.2020.11.16.09.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PD4ZgQMZ; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 1112B6E08E; 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 C2D176E9ED for ; Mon, 16 Nov 2020 17:37:55 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id p1so19601642wrf.12 for ; Mon, 16 Nov 2020 09:37:55 -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=wcR9SHA/hLxAo0DjnBJYKl1ZjLgHXt+Q6E2OPcU6TRk=; b=PD4ZgQMZc0zjxIrjINFoGLWFLiD9nsqe4m09WvxLwc4lK/OJwqcl5NM9CfB8miTxhp Ma93beNUf5CGer5yi6sN7aNsLZu1pCUWwPYqHrTOqtltVJK83S07N/Fvy8cKqs6Gcfx5 c6bIztFZ+QB2VhosEON3sfBHv3qhI9uuGnATdpU6Kl/EM2ygpRSqP4897TFPba5AKPcj V3jxwH4MpFQ8oIxWWM1toY80XO3Pe3eg05EXLZwswlr16Q1UFVnIX62o7aru7zSO+mD2 sCXBU6nZp6xSyAagvnTd8yKWIPJZzi0EW//O9VhlehDylZjokCG2Hsas/zDUJN1nh8SB ekDg== 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=wcR9SHA/hLxAo0DjnBJYKl1ZjLgHXt+Q6E2OPcU6TRk=; b=hUFl5pojgv6Z4SBMRN267gRswszxqanvl8G+mOOmfPEEfKx5o7Q9zLIak6nqxM/Ov2 Xtjyxzzqib3y+dFM/ID+PMfIhL3tUGUzUHwAGT5vzd6dW/9vJn+Yu11xmNpX6K5OcXaK Bu49rLD483zwDVbq3zHU2ujKnRhPNm4ZAKZm2py0qRBXxo8HTegsq1mWaZNuvRJByA1W Q4VcKVBRCB8ay2Prdar7giuP995VQCQvTD9RgVxZMxcjsYFB1RaeE6p5Xufw5yiEEI9M +Q/jc5NxPFfcal1R/wD0nuRgYS50ecj9qDu56Q70ohQ/OeRBiy3zIqavT/t5TeUmndz8 d5fw== X-Gm-Message-State: AOAM530yzvzYi3n+2RJP8xzb81lQ2mK4De99uCyBc503//KKxLF83q50 hT5pPdaSXiF9+3gszOiLszMLXA== X-Received: by 2002:adf:b74d:: with SMTP id n13mr3638294wre.101.1605548274459; Mon, 16 Nov 2020 09:37:54 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:53 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 37/43] drm/radeon/ci_dpm: Move 'si_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:54 +0000 Message-Id: <20201116173700.1830487-38-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/si_dpm.c:3802:4: warning: no previous prototype for ‘si_get_ddr3_mclk_frequency_ratio’ [-Wmissing-prototypes] 3802 | u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si_dpm.c:3815:4: warning: no previous prototype for ‘si_get_mclk_frequency_ratio’ [-Wmissing-prototypes] 3815 | u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si_dpm.c:3897:6: warning: no previous prototype for ‘si_trim_voltage_table_to_fit_state_table’ [-Wmissing-prototypes] 3897 | void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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/ci_dpm.c | 6 +----- drivers/gpu/drm/radeon/si_dpm.h | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index a9fc0a552736c..0dfb0ed9af89d 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -33,6 +33,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_ucode.h" +#include "si_dpm.h" #define MC_CG_ARB_FREQ_F0 0x0a #define MC_CG_ARB_FREQ_F1 0x0b @@ -153,11 +154,6 @@ static const struct ci_pt_config_reg didt_config_ci[] = extern u8 rv770_get_memory_module_index(struct radeon_device *rdev); extern int ni_copy_and_switch_arb_sets(struct radeon_device *rdev, u32 arb_freq_src, u32 arb_freq_dest); -extern u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock); -extern u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); -extern void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, - u32 max_voltage_steps, - struct atom_voltage_table *voltage_table); static int ci_get_std_voltage_value_sidd(struct radeon_device *rdev, struct atom_voltage_table_entry *voltage_table, u16 *std_voltage_hi_sidd, u16 *std_voltage_lo_sidd); diff --git a/drivers/gpu/drm/radeon/si_dpm.h b/drivers/gpu/drm/radeon/si_dpm.h index 1032a68be792b..aa857906ef93d 100644 --- a/drivers/gpu/drm/radeon/si_dpm.h +++ b/drivers/gpu/drm/radeon/si_dpm.h @@ -234,5 +234,10 @@ struct si_power_info { #define SISLANDS_CGULVPARAMETER_DFLT 0x00040035 #define SISLANDS_CGULVCONTROL_DFLT 0x1f007550 +u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock); +u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); +void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, + u32 max_voltage_steps, + struct atom_voltage_table *voltage_table); #endif From patchwork Mon Nov 16 17:36:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324475 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503915ils; Mon, 16 Nov 2020 09:38:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRvXMwOUKxeI5U7piz3A73GPQizno7BFAoFjsSvstP9Z3qzBice6u6bC4maCBsM8crZBoM X-Received: by 2002:a63:db50:: with SMTP id x16mr256865pgi.205.1605548312448; Mon, 16 Nov 2020 09:38:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548312; cv=none; d=google.com; s=arc-20160816; b=bTZQb+2crGeOqFavU62NI3GHUSQKLIpVNgbrC6ekA2KGmTAIiulRIWSW5WqsRsgSzv KyNh6I44AULkfHpSsrE4mY6b5HQ5KYvNjXFo1wZhc9dtvrK7YgYo2dq80ZYO6GgeIyqH Em/fXRp8f8vDj6FLf4zzGfbAm3ljYBGMqA51gjwLWVDniEcAn1eSU+Fl0IWPBnBe2DK5 HZxwgnGQrUYcmjzaNN17UEY3MAoGBiMBeU6uBfct22GvaxHJYYzVOuNXf6BvDandlhd/ QijtX1lgD+7ovziv2eW2/MhFlzTvYixXwtaoggH0tfy44l9EnIKVwyZ3Ij28Mq/xrfPE VphQ== 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=Vb2aawfp43Mi7/MVNiEeTSnQa3U752PpTuMSG0HXvGM=; b=CqqJ78UTgFag29oThdIBaV2vA9ljl3GH+WS0WURL7XtrU8R716BnU3fjEW1tILyTBs eMEpsgR11wWl4ip12Y7WUwOcOCRch69EeXdpg7hpFpmdicEPLA0Wh/cL7yEAuJmSPBOi ROK8+TGa016yccwadyYDQtgbhy77ja+tw56JP5VNO14GgG0DWIPOYiMsKYfsl9qtVArb 3cfzt/l5CPzzYpogWvwY2/KV7jv668E3UKJ+XeoQxRhNNhJHi52Lj2MmM5fWjJzZWc8+ HK0PGwAFFbZqGAD1woIVNfJUoOxlJPo7u+FtM0zeU2tRT4t8O9Bm4LxMuveSAgPKWsBI c8XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=L+oMJVXx; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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. [131.252.210.177]) by mx.google.com with ESMTPS id w11si8249pjf.113.2020.11.16.09.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=L+oMJVXx; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 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 2CDEA6E9DF; Mon, 16 Nov 2020 17:38:29 +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 171D46E09F for ; Mon, 16 Nov 2020 17:37:57 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id c17so19606208wrc.11 for ; Mon, 16 Nov 2020 09:37:57 -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=z5yx6D1LL1mWDIdbOcLaEDy3+e3cP8sILj2hqS9Zmtc=; b=L+oMJVXx9EMl4mh+bUkSyWc6ZsznYzTN9o/3eRri4X0NRlvMNWNqnxBqBkwgRByrAo S0YBk/0ZbUbEgQC33LIHX6VsvjaegjdE31kUMTrHVZbJAGoKJeY31+/chdLLZkmZhXyh IKrFDhsb/E3Mo7AcvEE05zKwMPDR2yHeiAFTAQmWXdEa7mlcKJ7fWIzJdrg/NHw4uCTR UirIeKolIisdhu4AO1Vgop6f8jxP5LHeQu6Wq57KGlZ9Ghl9UY6EIeeLQpRKhaoHdgZE 7solyMQ6JcSANJehQQrpPE9xiw2u/hn5rmtbWnd02b0KPSibjLJQDvttOjd9bFF11BcI m8CA== 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=z5yx6D1LL1mWDIdbOcLaEDy3+e3cP8sILj2hqS9Zmtc=; b=mFiJPHBnrRsCSVxI9CHSfKaNfcFkzyExMTbf1Jc/BxYL/4mXnrJJvjNS6ezL0yaMO9 uT8JOAw6cAfcwlAU+A/GI5Wjm7n8jAP/J9gSiSVwxavCNCjMGimn2aQRPz+VKqjtC1PM GHu6kQj6PfK8TBOTmcHY5BBG4oVqs+2MzOiPprxDD5xO///0fyzc8ZXHwHLLun0yBcap q8Vkpc3Oc0RGZgEPCbs+yt8OPTKFEbIqMKDPXJZDxIUiPsnSTy9O86ygxSoTc3qFQLkw OutBVMHVK4Fvcp1z8627AGiSLdMDTjcwvQzQiuXA8qCw4stdj9+bwi5TJoeEgVi7oVGB zYFA== X-Gm-Message-State: AOAM530DBK56bgqZD+Am5ayw0M+d+08hu+YI08FDHDUf9rY8fJafbfAq fzr+rIH/G3N8lnK8s8HVrcxXgLfNv7VKl4fL X-Received: by 2002:a5d:5643:: with SMTP id j3mr20002425wrw.43.1605548275782; Mon, 16 Nov 2020 09:37:55 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:55 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 38/43] drm/radeon/cik: Move 'Move 'cik_sdma_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:55 +0000 Message-Id: <20201116173700.1830487-39-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik_sdma.c:331:6: warning: no previous prototype for ‘cik_sdma_enable’ [-Wmissing-prototypes] 331 | void cik_sdma_enable(struct radeon_device *rdev, bool enable) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik_sdma.c:528:5: warning: no previous prototype for ‘cik_sdma_resume’ [-Wmissing-prototypes] 528 | int cik_sdma_resume(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik_sdma.c:557:6: warning: no previous prototype for ‘cik_sdma_fini’ [-Wmissing-prototypes] 557 | void cik_sdma_fini(struct radeon_device *rdev) | ^~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 3 --- drivers/gpu/drm/radeon/cik.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index cef0f3111cd3a..2af76463906ad 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -129,9 +129,6 @@ MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); -extern int cik_sdma_resume(struct radeon_device *rdev); -extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); -extern void cik_sdma_fini(struct radeon_device *rdev); extern void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); static void cik_rlc_stop(struct radeon_device *rdev); static void cik_pcie_gen3_enable(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 420207d19de52..d1bf541da5923 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -34,4 +34,7 @@ void cik_init_cp_pg_table(struct radeon_device *rdev); u32 cik_get_csb_size(struct radeon_device *rdev); void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); +int cik_sdma_resume(struct radeon_device *rdev); +void cik_sdma_enable(struct radeon_device *rdev, bool enable); +void cik_sdma_fini(struct radeon_device *rdev); #endif /* __CIK_H__ */ From patchwork Mon Nov 16 17:36:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324469 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503784ils; Mon, 16 Nov 2020 09:38:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJywg1kwN8D6NVDbUFaRZMVwTApFJWiPCfux0y+JabYUOOjjb2o7W6tHmF6KGwS9oUYUHheL X-Received: by 2002:a63:ff10:: with SMTP id k16mr275513pgi.328.1605548301714; Mon, 16 Nov 2020 09:38:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548301; cv=none; d=google.com; s=arc-20160816; b=wVWDycy3N+pGk6Qn6m6Codgv/qHtAOegHCHnv5qosBGuwV0TayZpVKuRnm0g226cZG I+hirdVvmtGqrS6OexjLT1Jdfv8rUUU8/F337NjWhb0xjsL/LZc2LVkHwCtOM0Umfy5j ZgoFxI24t528lT7hsjzT5xFTq74GFl0mNMf98IwcEZLbAItBxco4VWNEJMxZ9jK8ophz 2z8hUkeKrR3VKqCr5H3FZtyoO62HYu3nfK5lsQybGY8zGOdXetO4AwL1uf9HFC6ry3rK weyF9rciL+Lktgvbx5/13h/6TDUlhj2ZcNIrMkO1hAIhYQllo9sr+D+o7/nfMlcycoAq cSRw== 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=bW9LgFCTXbP8pwXueXfHQSHkVs6Ya0gS1GClpvt4D34=; b=vjn/UMCrnofaZ27m4w+ScryS0cXE2S09NeCqxdbMSh2WJNwmX5pFnP+clAe8xmZY1h 8jf/+Wnd7XByqw6RcX/80FC3VsxYLiRNjPIeDkIcZa+nMlfnavPAAeKMgl/2Pl4DlwO1 VEdFJjKiNOUlKprwZoXTkhfHv5DMOPeD3Uv8mLHvRWDbAmifL4R4BeP8rr+iE1iD74p5 s6MurnGkkU07v6GNJmT+qN7qrOw9AsFf6i6wXfZW7PVZceFumBQUajUVvQG2f7wGrI4F NmlgLFhAKJxML/uHgh+K4c6mc2IwsdHFQ9dx7mR8aUOBehiJOkG2nz/JgUOp6Ma5ZNWj dC6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=chqBnu6z; 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 e24si14133062pgv.244.2020.11.16.09.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:21 -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=chqBnu6z; 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 0425F6E04E; Mon, 16 Nov 2020 17:38:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 720C86E9E3 for ; Mon, 16 Nov 2020 17:37:58 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id d12so19599600wrr.13 for ; Mon, 16 Nov 2020 09:37:58 -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=8BRcDWZ7aXWvQb2HLCmLDCFOcRFyEf3okEuPgH0Vsk4=; b=chqBnu6z21+r0Ico5Jkgo7I4350aqeTvCmG8QOQsT5pNl6gDFWFT261j/mLR5uAMbd DFxkKRdF7AKhFpDBYJrykAlWGPsHlWXPdsKlIOesaCMuz3wwmFpTpo7L4qG+PdjUI/PT JNXcgXW9BR+kNudpSWdLgg2KfyxcHvQXCAyIhmdepS/mYfb6lZjCp2sXAaXbCI/MLye/ GBeuIXTWpoikpaZdzz2MxV7hLawA74yU5vLoWTTOKQ3QyIQBGvg4ohPJFS+tAu3/QZau pFTEb2Kf9GvfaN5PDp/c/vgEtRRJ3ucQpgIyScWOIzPBN2dhpQ9MEyspTdnWpiBTI92B aQwg== 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=8BRcDWZ7aXWvQb2HLCmLDCFOcRFyEf3okEuPgH0Vsk4=; b=QtGEbHONlutAh919gJEq5+J/fiEgfvlX4DKsZqkdecXhTxc9iNnMLbK8k+KhC4gWl8 L2HkqMH/YM+OJwCuGt8KkUqysPr2R0fuhXxoAT5+fgiIaOJSGSGE2XQ06Kt4IwrOoJNG 8fahve7lNo43hVoqYAGj34Pd/YrgCVLEyXFcCfhuDOQRgpDdGDVRONAblYMq0f7GMZ9k 9OcI+VlKemZGz0n8sL5wVwML54ffBKNuycvM+Lc9/rPzHy5x7l/tNJiWTL8J14Nz+kzU Meb0mP3KR552d0s2p69lV5+9VV2F3rLfVbIDWWS1/GJ9GTPfqM2RR02yBRPzCHzZeWek FDcQ== X-Gm-Message-State: AOAM5326xRTo9efh7Yjt95cLy1FjNGd6JnRdZvabpaoVUKalpBkJyt43 vTlgqi59MR3pOylWD1j+KkcdIQ== X-Received: by 2002:adf:cf0b:: with SMTP id o11mr20100544wrj.162.1605548277091; Mon, 16 Nov 2020 09:37:57 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:56 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 39/43] drm/radeon/si_dpm: Move 'vce_v1_0_enable_mgcg()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:56 +0000 Message-Id: <20201116173700.1830487-40-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/vce_v1_0.c:102:6: warning: no previous prototype for ‘vce_v1_0_enable_mgcg’ [-Wmissing-prototypes] 102 | void vce_v1_0_enable_mgcg(struct radeon_device *rdev, 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/si_dpm.c | 3 +-- drivers/gpu/drm/radeon/trinity_dpm.c | 2 +- drivers/gpu/drm/radeon/vce.h | 34 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/vce_v1_0.c | 1 + 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/radeon/vce.h diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index b4581392fbce9..cd07b06301b44 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -35,6 +35,7 @@ #include "si_dpm.h" #include "si.h" #include "sid.h" +#include "vce.h" #define MC_CG_ARB_FREQ_F0 0x0a #define MC_CG_ARB_FREQ_F1 0x0b @@ -1721,8 +1722,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); - static int si_populate_voltage_value(struct radeon_device *rdev, const struct atom_voltage_table *table, u16 value, SISLANDS_SMC_VOLTAGE_VALUE *voltage); diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c index e005c18aac00e..08ea1c864cb23 100644 --- a/drivers/gpu/drm/radeon/trinity_dpm.c +++ b/drivers/gpu/drm/radeon/trinity_dpm.c @@ -29,6 +29,7 @@ #include "radeon_asic.h" #include "trinity_dpm.h" #include "trinityd.h" +#include "vce.h" #define TRINITY_MAX_DEEPSLEEP_DIVIDER_ID 5 #define TRINITY_MINIMUM_ENGINE_CLOCK 800 @@ -293,7 +294,6 @@ static const u32 trinity_override_mgpg_sequences[] = 0x00000204, 0x00000000, }; -extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static void trinity_program_clk_gating_hw_sequence(struct radeon_device *rdev, const u32 *seq, u32 count); static void trinity_override_dynamic_mg_powergating(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/vce.h b/drivers/gpu/drm/radeon/vce.h new file mode 100644 index 0000000000000..1eb4f5715202e --- /dev/null +++ b/drivers/gpu/drm/radeon/vce.h @@ -0,0 +1,34 @@ +/* vce.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2013 Advanced Micro Devices, Inc. + * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS 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. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + */ + +#ifndef __VCE_H__ +#define __VCE_H__ + +struct radeon_device; + +void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); + +#endif /* __VCE_H__ */ diff --git a/drivers/gpu/drm/radeon/vce_v1_0.c b/drivers/gpu/drm/radeon/vce_v1_0.c index bd75bbcf5bf63..70c5da2141d75 100644 --- a/drivers/gpu/drm/radeon/vce_v1_0.c +++ b/drivers/gpu/drm/radeon/vce_v1_0.c @@ -30,6 +30,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "sid.h" +#include "vce.h" #define VCE_V1_0_FW_SIZE (256 * 1024) #define VCE_V1_0_STACK_SIZE (64 * 1024) From patchwork Mon Nov 16 17:36:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324464 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503743ils; Mon, 16 Nov 2020 09:38:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDPE/GmnEOUNapADInkKI+oGd9Q0BA6+/Wh2ss0y50v+T37Tl/GbDGtrMCJEjA7D+Hk0I7 X-Received: by 2002:a63:6ecb:: with SMTP id j194mr273000pgc.420.1605548298295; Mon, 16 Nov 2020 09:38:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548298; cv=none; d=google.com; s=arc-20160816; b=bjQ/n0ufjcMdwZhvQnq2clI1jF/sbgr/oaokvg4jdKgSrjkiMnL0YUBdQDe4+IaiPc UNdfWxLpTSXhEQnyO3TtBXY8nI6izXSJeV7ar9FV6oZ1+NyUnE5ss/FDdcY4iGmvfbmB d5G+o5ocdwRKpAC3nMUBNGH6q2vdTf/lCSUNVzGm/aXhrIQrR+2NYKU6oFPnWrVWsHsR mJsCtrTND3V+Y/WJPWwfWTDU+x1d9DD9qFIrd9ZNdL2wRnhC9Q+6GF+9zLwpdxliPLHY VptM2yPhckqR0XwiasgmcTT6GRZ8/NmtN6mt25qy+i1rsEaQhLp5NuvieuKfhfyVI2kE uHyQ== 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=nRk2XrB74Bdyic/Fcml5GzzNCOPlOOH0SWZNVZwJuUQ=; b=X2C7rRiggyroX80X34/tTRB3RnEsJrBJSVDP+3aX2gWl276PO2sgLJDAkB06WvKRpU vMDBsTDzpvDTtita4+COdjoaiGJqEzQt/JNy4DJMqyT6IayaDXki/dTFgpiWpfFLEKYy A8ESZKuicsjT0tsYLZGegEJpriWbXNPSJ5Uov8L3UR38uYvNfuLDXJVq9zs1VJZCV3NS eB8wGAgCxAIl4w7tFZJCEigziiFMZ0twqd39XDGPou3d9SPNNZpguMaIjadK5YnUZALH 2ImfSFGd1UpvzuPZvjmstaqz90E5E5oyIVVPBI6BVwPoDJOBmtAv5uqcQ8u/ol62XAnN GwUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WirrMl8f; 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 nl8si15504pjb.73.2020.11.16.09.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:18 -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=WirrMl8f; 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 3B54B6E042; Mon, 16 Nov 2020 17:38:17 +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 355926E04A for ; Mon, 16 Nov 2020 17:38:01 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id r17so19666558wrw.1 for ; Mon, 16 Nov 2020 09:38:01 -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=RO6gVjdG8KAsdeDZko1zQc/smdj+DRpN8GOLXtDNvO8=; b=WirrMl8fUxp4CO5aIQmGr0dbC4i6LjQ5TaIvP1F18yQ9bcjLr9Ahv5ncmc+D+rDiB6 jnXwyVZOgt697WzPOCzN35MCspjL1F3oMNO4pyQlFbKV/AqhvkypMuRxRQYT7fGT5qm7 qoIltC6EqdtoQgVkm/2T9Ne73ONBGIgLLk6eKipqsjzPYB6rLceNhPW8BkX68K8qJ+0u gOl5LCqRWDmgdQzuSIwQXhlqFz6Wwc565XdPtH5Eap/jQVVI88UzJJ2k1AWvaVfFKnLP xQRuYkkDCZemobG+VP2trTK/7X/r5owlR/Xg6sjuoQ6grn7zRLl0HAvyrc3Z2BHBeROE M6iQ== 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=RO6gVjdG8KAsdeDZko1zQc/smdj+DRpN8GOLXtDNvO8=; b=MfHyT99snw89J+uL85KoAcrrcmUh1TpkRwokFxXVSCMZ8pp3Kh0XtwgVtcMQUrbhFe l/moIBLvLd9m23bFK2qrYPJYKEYI2A9rHIP1S4ArNiS7753DnzJVMQu/31+uyWvDXl8E wKXBkPZ1RqQyr8pbccewOdevsztgpxGwUoAIaDX1vBUsnQx47KvcW0HiUlLeb42wtSx8 qSGenhaiOw/pRzYQEg5EOQC8MeCHLdwPi3NaHGikZWkidNDjujGgswiZ1nRJwIF/VnVD v+YPlGHKn7IQGtri3MhXLXRQM7LabPybGcNpqYt1r+2FTSg5LMK2IpEyQURaVkT2dzsF Qy4A== X-Gm-Message-State: AOAM5314lxjsQ9+6xPKGxLzDS9oP8T9ATOtcsigNa64m360/BgE8pUGC dB+n3moC3qG5xE/12dH1Z3A3Ug== X-Received: by 2002:a5d:634b:: with SMTP id b11mr19958992wrw.97.1605548279761; Mon, 16 Nov 2020 09:37:59 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:59 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 41/43] drm/radeon/evergreen_cs: Move 'r600_dma_cs_next_reloc()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:58 +0000 Message-Id: <20201116173700.1830487-42-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_cs.c:2343:5: warning: no previous prototype for ‘r600_dma_cs_next_reloc’ [-Wmissing-prototypes] 2343 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, | ^~~~~~~~~~~~~~~~~~~~~~ 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/evergreen_cs.c | 3 +-- drivers/gpu/drm/radeon/r600.h | 4 ++++ drivers/gpu/drm/radeon/r600_cs.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 53b75cf201958..0de79f3a7e3ff 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -28,6 +28,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "evergreend.h" #include "evergreen_reg_safe.h" #include "cayman_reg_safe.h" @@ -37,8 +38,6 @@ #define REG_SAFE_BM_SIZE ARRAY_SIZE(evergreen_reg_safe_bm) -int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, - struct radeon_bo_list **cs_reloc); struct evergreen_cs_track { u32 group_size; u32 nbanks; diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h index e66ef58706cd8..dbdff4568516b 100644 --- a/drivers/gpu/drm/radeon/r600.h +++ b/drivers/gpu/drm/radeon/r600.h @@ -28,10 +28,14 @@ #ifndef __R600_H__ #define __R600_H__ +struct radeon_bo_list; +struct radeon_cs_parser; struct radeon_device; 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); +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_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index f20b619466816..dc68e538d5a97 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -29,6 +29,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "r600d.h" #include "r600_reg_safe.h" 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] = { From patchwork Mon Nov 16 17:37:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324471 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503812ils; Mon, 16 Nov 2020 09:38:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/ODtDHHvZ2o6nkq8xpU41jtClBnLEp867AhwiFrz1Jz91OF6rhKw12joQGoCGjwhPMmsg X-Received: by 2002:a17:902:59cf:b029:d7:e216:9260 with SMTP id d15-20020a17090259cfb02900d7e2169260mr13101800plj.74.1605548303967; Mon, 16 Nov 2020 09:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548303; cv=none; d=google.com; s=arc-20160816; b=RIDRJsmg/MMMr9E/geHUUJWn9s1qmjadHckkC4SD4xWb2NLUmD4H6Ij18UA5f0ILJ2 doO+QZbCLOm/zZidc5VXAG4Q9YxzfFWsptXh7BTMtAJ39sS2iL4vDZLn7W18C9eIVcnq 74WG6aA9iUCjOsia1lqwhAf59zyceSpqn1nScTt+FIMVmosbc4X09A+0n3FRZ3uG9l7Z EP8lGole16hGLFFWgufeafZqpPxMmtuw3uQdcqKeMzNrjfwAEvvsB0djgLtPOnl/QY5E OtSkBGOM0ZqbeIMf7SVfbkWe0Onir3W0CGv6Ss67+MM42OPkRUpwKbwj57s1jkPe2Ose tZzQ== 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=K7zaZYLT1TW90KGgw7yBCdCfvIx/KrxLQsmPbB5p+xc=; b=QDkHpW6d06jEQOoap80hTyljgsigKTyj4P8+k4FvMB8MxyoCxsh4Uso9YQ0ZHEMa56 0jiJsRouF1WehI/HWNB5LSDWKJYGjpmTC5Ksd9YawBnHVEYBAqLsYgd3jJgUfryikiti 0awSxcyNzuXtntVKrfIKb4OFWSV6tmKUapY1eZcP6mrcKN8iKIQaEqR8g9YjUXzJcfyN AtoCe1N5T4RfQ68S1gApOtLlRPdANaO4GCNwrfpWH9w5RXxmBLa4FRLj8d/GsGc/h5ko lv0fPQgPRgKcyvAT+TDoTZllF0kdYgYXGexehVFgermmoleuqvRF0AI6fDqyfCTlvQUe 7i3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UuKytIDb; 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 nk17si14906pjb.77.2020.11.16.09.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:23 -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=UuKytIDb; 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 BEF3A89AB7; Mon, 16 Nov 2020 17:38:18 +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 9A7E06E08E for ; Mon, 16 Nov 2020 17:38:03 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id u12so12421709wrt.0 for ; Mon, 16 Nov 2020 09:38:03 -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=6EGHBJr/siM/pdwXEUEQclk4ZNpHlp4udszmTbY7hrM=; b=UuKytIDbOl5cWtgBiIsWcmk9ftgGmt0ocZumuYxm/bwx2yewiFf7ODuEWIWUObEHwt u/6foaKVEKE7gFlKbWuWb0Y7knKW8H+gYjQY8UEn4ujHVnNw5RXWGtFUC6ISAdzmwmS7 +3KmvW/h75YvcbtZcJoSTl0bs3A2kvABq1p1AuAdFzEnSvx8QjhtCxz7Bo7ZoPVxkzbi O8qEVO0+JppHqjPK2rDiYgMvBNL6IEwVh5R5YP5L5vGzYCyEc8RMaYWqnmkwkaJoYA/1 6gcjOKEOJXxmVUbCAj/WEQRbp0GDt435I6cxJCgWzRVcdAO/isl87S9qubkTrh8VFn5S VD/g== 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=6EGHBJr/siM/pdwXEUEQclk4ZNpHlp4udszmTbY7hrM=; b=jiO1P9FmBhsvghMtLR0Uzh4lotw9cw/83AnY7xjJfenD9mX/FPX9eqx07/Ou0D+9yx p1ptrj4gGy4Fstr4MQ9OyDD4ODGOargjFiuPkv96Pfg+Bcm2aPyp2CTGaVfZq6OajJYk MBl6rtQFwxlGBulcu8r7FLznCDUJSScoMB++L1xf0oFGFPyDiTrK9lkpe0JfC2cM+uik eyxP9iJazpGzpJOWfeCIIF1sHquUxHqGM0zGfXL8Bv/3loie4wpX/lZGff/RgQlpsKrb il7ZwVD94Bg5m2NFS83ilteEpHbXTvWdRcVOR3HpwbWgzBif/RJnWbGCp5uNn6tepumt NYQg== X-Gm-Message-State: AOAM531GqdecRDHbnkRjq37LbnJsbSpT4dgRC5zokDO0TvQLPwxMK0vF ExFLXQiPnZgYBgoUJat77JDDvA== X-Received: by 2002:adf:9e48:: with SMTP id v8mr21997979wre.55.1605548282267; Mon, 16 Nov 2020 09:38:02 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:01 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 43/43] drm/radeon/radeon_drv: Move 'radeon_gem_prime_import_sg_table()'s prototype to shared header Date: Mon, 16 Nov 2020 17:37:00 +0000 Message-Id: <20201116173700.1830487-44-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 , Gareth Hughes , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_prime.c:43:24: warning: no previous prototype for ‘radeon_gem_prime_import_sg_table’ [-Wmissing-prototypes] 43 | struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Gareth Hughes Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_drv.c | 4 +--- drivers/gpu/drm/radeon/radeon_prime.h | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 211932d73b191..7a0989b397da1 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -55,6 +55,7 @@ #include "radeon_ttm.h" #include "radeon.h" #include "radeon_device.h" +#include "radeon_prime.h" /* * KMS wrapper. @@ -129,9 +130,6 @@ int radeon_mode_dumb_mmap(struct drm_file *filp, int radeon_mode_dumb_create(struct drm_file *file_priv, struct drm_device *dev, struct drm_mode_create_dumb *args); -struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf_attachment *, - struct sg_table *sg); /* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO) diff --git a/drivers/gpu/drm/radeon/radeon_prime.h b/drivers/gpu/drm/radeon/radeon_prime.h index 11b7f80987834..24ddfd4b48a6d 100644 --- a/drivers/gpu/drm/radeon/radeon_prime.h +++ b/drivers/gpu/drm/radeon/radeon_prime.h @@ -35,5 +35,8 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj); void radeon_gem_prime_unpin(struct drm_gem_object *obj); void *radeon_gem_prime_vmap(struct drm_gem_object *obj); void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); +struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev, + struct dma_buf_attachment *, + struct sg_table *sg); #endif /* __RADEON_PRIME_H__ */