From patchwork Mon Nov 16 17:29: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: 324413 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3497825ils; Mon, 16 Nov 2020 09:30:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxE9pRmNEI1unEee4IjKfp+eV7nDg7eFBLupZEnTT8c5x/XB2HZGNbZW/lnMfIj1ghX4AJM X-Received: by 2002:a17:90a:4281:: with SMTP id p1mr17707967pjg.87.1605547815272; Mon, 16 Nov 2020 09:30:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547815; cv=none; d=google.com; s=arc-20160816; b=WA6ddVCEbxOlLAL9mQ8T5IciAjQ0KslfMK0oGRIvJVe9nlE+2y6u2c7SAz+ANUuAAO jIoQ3sVJCuF0c6bW2pKiXCQEZQs3bXZf4TW/JjT00yNA6RNwaGSBaw7PrYfe51Y+Bynx 4W07D4GoL2EQUa07HZ67H7YNKG14ngwWrQT4yyOq3NFJkpQ8IaYG2lT1B7KsB6LRaXZM /yM3JO3Of9DN88YbMZ7vCZt7sATSiashF+pdHJNu7dkxl2ZQeeH5dRXI6eC/I3qeT4h8 5R1AX8g/0d0x1pVd4rd8tUik0Xh/LpuZ71SEi9jkKcQCZcWj2NHvHbk0iw9eagF/SBq1 ew5Q== 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=yXPu6Gx4037xZBDie0xDwtw7jngSKTJmudP/Qnpxx+BjKGRy1niv/AIPjDi/yIReNn 6aT5xro+Zo32W8DlTbXegtZw3jhOkE5NdiwFgvXavkpdI2o0y/ojo/KiYhnBuVony7xW vGxMjKbMNVAOUjGWm2ted6R1LAIeIPsXjFaWBUSLUjpmr2D9KZUivwRWHYHUQtP0AWQw zg65FGJJlStrXKStr28yGfb6dA87KlHs+nvroY2xVVYCihzpyfEOC4aCPORPuz1y4zV7 Vk4z5egrOb69bOigYMbbJkAWrWBSbHf7WtqdWaaKFp9sr9m1htHFAF5FRCV2h660hbZF +Jvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=w7NXvRpz; 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 b10si16194091pgl.297.2020.11.16.09.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:15 -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=w7NXvRpz; 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 357E489F75; Mon, 16 Nov 2020 17:30:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA76C89F77 for ; Mon, 16 Nov 2020 17:30:11 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id s13so24354260wmh.4 for ; Mon, 16 Nov 2020 09:30: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=Xb5oU/OD2Y3rEdVts+1SNNg+EwKMwAAR+VS8s4ifyQw=; b=w7NXvRpzd6ocS+5FSqdsaZu3FdrPnEfrBt31TUnTJfHGHtFLIb1PtdzBxYzLEJSZ4t UYtP+BvBN28qhjNd9+vn+MzSCwRZKFTMRSgwCK9yGwjcVWtpoO5rkrnAQTod5+uT6IS3 DG4NYRC7N1KBkVmUG67DnkwuVZPROZtBcouRJrbhrSd8AqALBM30h93G2mgoyLQE6RFp hfSLbsdUu+ywMyE6858tw/O7m6MhlJpSmHleJe4aLJ/S7nvDHaiv8xknh76zmJO5ULIJ IZmroZyYP259sTS2fWQKi+/wC6AWIddT2yAh9L1CuqHGP9qvCirPEqXUCuGW73RzSz8b J0vg== 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=S7fil12jzcZdWtKME73bOh3Nqgl6/1cA2+vHUnkYAtqz7IBnnpuLeyLb5WHNHzdDfP 0tWMKfW4sG2vpfUAn8n8Eyc+Z1pVp/m7awUJCQFq7jiSlF5NQTShqC4aI7O/gD01CcBo rQQhpcQLeolIykPOELnhVgjEUl/L5hr2BHGdjRyOHM5hOdJ2V2CfiO2fa36ulxqZFA70 aTIoTi8joaRJyR8A2Gk44omjkN0fN9tQzaBKBepnNZL/vulBAx9+SGKLvB4X4bzHQN4C 8zOqFqQkwIJI6UEDtc5yKjz2KyKIrSojXfZUhgg7FSG9XXcb3gMrr2x1WTc09NVC0TSp I1sA== X-Gm-Message-State: AOAM532RgXSxGmf/0L5IYXMTBdH6oDy1qE4a5cpsHpGksAHJoKA90uh7 0J9scccPjcnBJxmeeMIis0GeNg== X-Received: by 2002:a1c:67d5:: with SMTP id b204mr16966162wmc.92.1605547810539; Mon, 16 Nov 2020 09:30:10 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:09 -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:29:23 +0000 Message-Id: <20201116173005.1825880-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324414 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3497857ils; Mon, 16 Nov 2020 09:30:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJznBrtN07r5k9I/f34i5746UkW2ObesHZT8UbgfXiMhUaX8FdNaZ0haovzPh22h+UkILprW X-Received: by 2002:a17:90a:ab89:: with SMTP id n9mr17161795pjq.104.1605547817065; Mon, 16 Nov 2020 09:30:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547817; cv=none; d=google.com; s=arc-20160816; b=eEXxcVVpo6m1rKdb1JbMaM24WtI7EUMh9xSrskq7cuFwacdsqeD6AUz50djEgTCBN7 cB3QcuRkzfGrzMoKD7lUyvRYWTbBoFQJ307v44UNOBOCENTnMNwH3QpMTvKnalC0z/wz VG6on0qd1tMZ2m7uEe7nyG5xMz00uVWI1cmHrdxLHxcKumRw3NUyL77eqfh7NiANe6V9 m2ee8rHR7LwvRv2u8bZOupBo+WfX1GuDlxeUlKz5A+p7ubJP4HqFlXv4ukRhLJ6UEM1F Z3ug4aQ2MLjolg2CvjRTno3ZxwrE9ZsXphBQHrj6lTU1JE46f98j4mnB4rn4aszLTKK5 BHYw== 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=OuRdoPz0pOcWL9Axh4AE/Mge/xueocbFExqhYECGNUy1JKE6riGGmEzfgKgNXu7TLf Qq/EQjU5xNZxaVyNMGfnVlfSwt37Nlq8DNBccxKWE9dqWubb6BpJdo+sw+WfpPqWPvrI o3wABlbR5V8IQyZiOgHjZIYY4MiUHYaBJUy/FiN9TP9FA6QKfFBr7aTg2eRhiVWmQT5t HKhA3ofN5lw/pWDupDDmNdhiEJCY75e1z4F3M7uIJPD2BvfKNduUwB62qjLL9J6Mx4Rt 9NvHFQrO2NY5qfbXNVlEaAEKEtkAvAZksWfRNRcdcvnhyykoOvmscuy0k6ziXUOhfWUf Qeog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="cVJh/Ke+"; 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 v125si17552120pfb.217.2020.11.16.09.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:17 -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="cVJh/Ke+"; 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 3B89289F9F; Mon, 16 Nov 2020 17:30:15 +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 36CE889F8B for ; Mon, 16 Nov 2020 17:30:13 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id o15so19607813wru.6 for ; Mon, 16 Nov 2020 09:30:13 -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=cVJh/Ke+OD3Oll6rBgHwkuRb+Nz6wo5pKXlIS2z7NkqcZeSlGdbl1LW03toVNELEle LB9raRwisH2MTIhDMoAq6JwKRfx6IpDTYKgM1JwYpOtE82ZmIIXVjcsRCCY3EVqVwYgA 1IdOzo7dyBuR/SyeCiFrCs9DOxgyv4VbvC7PJ62Gq9ymaVUBVuPyvlhwxd1ywS70eaQg 9NtGYiwVYJ3135AaW2b8kuQ93Fg0M+ZZ89cYlkYsqlUqnZnLZPULjeVzLuH9CxQBZNwJ Ax0EseW8X5M3aMygECFAh6szNkJH5IZSQqJkTJLvffdI2+VLjE+ITqmAzQwVp5Lp++Us Kb8A== 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=FTwVxqoes9cz/4kSbhRzsbsNQ1SFjUzZZQdRynSUQvmdpAzJxoV5tkTfr3KJp6p3/J 0AqXG4bPsofsH1g9wmvi0Gg6xLgSHM1aDZmAaPfNnp/ohco04b9fjZdg5UE+i+urrSaS 8nJ7FwVmuGg4dzxTumo9//E9IVgQUlSK13nFuPLhSiwxZWcvykJO8Yyftehp8hQ2Ngoy tfFC+bmsw8M5T5o3Ob5j9TD7phP/INs2jijLIALsyRljLvzPf6sROv/sWfBs7cOqWYz8 z7eqwR2t3nwUg3do1QdRKqAudurSI0Moj4p9LDW39mGL/EpOGoJcSr5/lCwvDo1035h7 TSbg== X-Gm-Message-State: AOAM532EbjX9NvJhZmr1Z0+L1qv4LDavRqw1iVW/MTktNtzkjCITtug3 OUv6mohP7YFNhvKhtuJqVuOeDg== X-Received: by 2002:adf:b78b:: with SMTP id s11mr20356134wre.42.1605547811771; Mon, 16 Nov 2020 09:30:11 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:11 -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:29:24 +0000 Message-Id: <20201116173005.1825880-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324416 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3497885ils; Mon, 16 Nov 2020 09:30:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCnYOdKSdoHhHiSdSfPAgOvqCVQtMXnIt5IJtRse98bMbm3owSRHfpPBFdryU+mssiQH4A X-Received: by 2002:a17:902:a502:b029:d8:e85f:3ac7 with SMTP id s2-20020a170902a502b02900d8e85f3ac7mr6810259plq.48.1605547818645; Mon, 16 Nov 2020 09:30:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547818; cv=none; d=google.com; s=arc-20160816; b=MIRFNlysRKdUyEluoceSWw3lZdPjqYQQ2N1x3Kn0/E/UcbgnDTd3k/+NJtgTWE+REV qwmCpu4C9NZGGHiqLALs1kjFQh4tYxX6MZObkAvoU3ouy/7xMEZBCMdiSRX7aSt2w5zG PEwLIJeo7AYrEAigRunIxgalDZ3ZTaJb9ULa8PARflLyndxqnkv8k707FzZFRIGCFvdH fdWmhDwBqbn9Tj4Mt/Q9iw3GVsl/kzxk1t5SSUavduu1a2RqFgC6jK0AnhUTka06QcOG TPczOTLlRtiRFcvmqVBpPn/8bkAGbEBHui+qCBgNGIGKJTD1/XXMGtoiWDfVgwwTX3w1 zpiA== 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=x3rnoy3znjuiRYnEQNMqbn7zSjm3m5NLUWjjz492LWTKiYd5/3UaOeQCUjClugIyx8 E/egwWwWc/HcdLBA9it9XpOoby7Qn/A5yxxqGGoaY2WSdYRbCtJn+VH9yWgrnyeE23ki R9tvUOJ+OCrYEbiPETLed+f7ixUS1QMBxYEYfy4FnOiwkqCs0pmb5+ctB4ohU4/XbNYP T0woqPuT9hZfiYGgolt3i+vCkzzoWW9tgO9Az3Sltr7AshzLbRKYoAYUGhQPPTEOZTiI 0aIgk88TAU4ZJQw1UfumTvAWEMdHEWTXrErYGLf/3pNNFmNlL7XOmtjArh56lU/cV3Jv aK8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZrJ7nX+S; 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 n14si1546795pgi.267.2020.11.16.09.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30: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=ZrJ7nX+S; 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 6CA9489F99; Mon, 16 Nov 2020 17:30:15 +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 8597B89F92 for ; Mon, 16 Nov 2020 17:30:14 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id r17so19637098wrw.1 for ; Mon, 16 Nov 2020 09:30: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=XmKc1pxfWNIhhVZbat4IeYMq2SqMBDzsHL5Wfk03ato=; b=ZrJ7nX+Ss2SwWtGJ5a77Xmq6naZYfFaODqVex6B0ksRVu6CPODbPoqrLXrQzYtwaPO g2v5cNvW2Nq96enR9+AbUk3KUpTCjHRBie7PJXTRF2+zjdR2dFZ5wzFfvYmprBW28PPX gd8RqEttaE44L9FUKUGhdDo3sNt32I5PLbysKwTyGi5YOJN+PueBEhdW4f9haTBRn06T /iMwHs1+TC6BEalMW/9cWcHAGfDzJnRwWBoQBrZ8mIkc02e5cKDWTcy2S2gs04DAvUAv N8Kv7DD+nUHndcbDQag4Pqnp55eMgu8spglrTL8SXYWmnuOdWnT07R02S97rOIad1pmx XPtA== 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=DTwID7nHnorrxwXhYlSAnP1gYQdXFVvJqjMvVKSc1K4OQ7xR29HKVuWNeNsAmyChU1 ZKOGl29jz8q6kAezO4OAa89dcs8ccZ9Zb466l6XqjuXJsHoD2uJqdfpOqwGBrpLITb8t AQifc1JJ9r9RsDCcgw3jZ5jnIjXqSVVUJ1ziEUyBHVzUokS9RCp3JnnoAx3yC23VHage 5+oUkVN+94cYvX/YRyHbVKlMOUxDmsc4917CxAu22F1YvHVYTkLObOds0xg0ruRET5P9 QUsFor8Sy1BY/kL0aDA3/5xjs3RbxPRLD6XERAb5g7eU735VKwSRXxdAvFV5903oEMho jF8w== X-Gm-Message-State: AOAM531jBGfJz4Gs4nVDZA56zKAQevcKztO3LdTd1m1dLkpM25rMDfr0 fj1V6oggUstwdLMEiaabm/oN2g== X-Received: by 2002:adf:e287:: with SMTP id v7mr21597907wri.252.1605547813193; Mon, 16 Nov 2020 09:30:13 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:12 -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:29:25 +0000 Message-Id: <20201116173005.1825880-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324422 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498035ils; Mon, 16 Nov 2020 09:30:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNC2cM6LniulhY/DteM1+T0E6MUWSJOLztHG5Aumi4M4HWCOy97SETOKq0NDgzJPIrlkkQ X-Received: by 2002:a17:90a:990e:: with SMTP id b14mr16949520pjp.103.1605547831824; Mon, 16 Nov 2020 09:30:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547831; cv=none; d=google.com; s=arc-20160816; b=SthfqvJm+J7HyDHlEROGwtnFWZcsMyNaEMf+NdarL13vHrRn89CoT3f4BVY0ON1PDn 7DibN4xASUPmn5bHG7/bN7+1tjMbWguXwQkBEuBitODpf2lE79Icn8MPz3KpMZn2FOAC 4lTVgnqVYm9LldUeftvHcnhL1JS7mLedkkhFbfZgcYDQs1GsE7X0M5nvJMlQpWw1aaBu +iWtcyHmzJbKsg3Czo+ZDy6kp7kGBDzskvHcJZsPErQqTZsrjE4109RnB7xc5jIsdfLS RlFwTNw336KpKNEC1acD+y+hONv6iQkkpHXFK25kGrKUT7RbFzW2m47V/xu1GSch8Znn neRw== 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=zToh1gaeS4ggBYStk1QK8QbAe9m7569QdWEcgEfuMGO/99BXFfqnVWCbiwsOKEuJu+ Z39FuvovWFGwtVI55WF5pocXWctkI89CUfFd2/5V34DnCFQbdJb4swo0K7StKY356SpK aDT9f0V0jqF2sUv/Wh+uNfJ1mrr+V5wBbTELpfrx1lhZMKkHomQoX9/QocKd0i6RZ4pc 5gofxGQDVkM0QzHDxWTtT7pya1RhQRgvRgHnmbaRzfZBBH+bUcmILSbF6DUV/UnDM8ye CAesdCqrXzjZjO2UMAMpzT/lAQBEMfnsPbnctzoit9liNNjEuGI0VmotvIk6YKDUCeP8 LjRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NlJq01yN; 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 mj16si1691pjb.73.2020.11.16.09.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30: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=NlJq01yN; 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 C58B989FE3; Mon, 16 Nov 2020 17:30:23 +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 039FF89FA9 for ; Mon, 16 Nov 2020 17:30:16 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id p1so19573086wrf.12 for ; Mon, 16 Nov 2020 09:30:15 -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=NlJq01yN62/e77yfB6ZomE53I8U56CttbAyj4clNq3rSMAmYjlSxdP0xAxdwITbYtW sNZ+AOXxf/dARjEuzp8azDZAHdjkgVt3bgmqM8kJb93CiPxgqwvl/zDtxvtZ3Nazf1xH u9C2opkk5AwyxzR1/c+HIM70U3y0+DMvcTOR3Ks+QceLv/sm37rlMYYDvKervOmliQyA UfA4WtUViRXgfqDRp0doP55lKhCFdsD8+fuQo7Whu60IdoD9P0nAGZkFxZjZawoE2go3 wy7km/HXTpoxfzK7EE3prhyBihjsz+RHRU9qKmVPPhCHynV3oXCsokAfORHJ/A0SM0DI 9B8g== 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=U0JawmLhCY2hBgaLjky0U+5x9pOTCtDVUrHRpFrqq5Q2lEOfPArU2jA/DWZoFqSsiF bNIcd0NPwXKb9wawpcRwpr01jc9CjbqgLO4G3Q4SAyrowUfIl6zAQMew0EAwQzEHtrdK BaExozEEWTW8YpvPkbJ44GStyNOtODfFa9RJO10StqZXkRCJmJoNP26LL18vokpNFQ8Q 9oQXOdVHYSVhktiV/nUknJfs0hX74F80AfoKrzFMXMDa9v1+cKbMk2Jdh0ksMvIHOnO6 E2d9re3Tke67e/c5Wu+uL4LSu8wEMuAqcxY1puSDKpmHKLkqK1mjNT4buuh5KEB0dAJp JUZg== X-Gm-Message-State: AOAM5310EuxvMKBrCUUTlb4t5LD+y/Nb89ngStyjUS/zCDB1ECaQO7s0 g3SteQqoPEdxz1uZf38p5bQf/Q== X-Received: by 2002:adf:f9cb:: with SMTP id w11mr20990525wrr.1.1605547814676; Mon, 16 Nov 2020 09:30:14 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:13 -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:29:26 +0000 Message-Id: <20201116173005.1825880-5-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324417 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3497952ils; Mon, 16 Nov 2020 09:30:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0PaiRNczENGyzLeoojFSDEEGDpPcI8LJX18kk60Qso/4SSjtFl978G/MXl9GdZmcg48N4 X-Received: by 2002:a17:90a:de86:: with SMTP id n6mr14620529pjv.214.1605547824346; Mon, 16 Nov 2020 09:30:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547824; cv=none; d=google.com; s=arc-20160816; b=euDAjF5OMGzla4vCeoi6DGHkC8tEDjOWIVl78Zg8s+XwhiGqC1OhdVEvbo9fho/z0l 1mWSFClSQ4l5R38944JBqKSFv+/UtvPF6Cb1WyK34/oeLLql4QH9OBtwf3RgBnZqJKPC WWRjQHJyDDe5Kl9gi++GDmPBPx2QvE4idc5HyYiHcgfgRh0ihhjfAV+BqyFiwzE44i+j sVL05AqDLnYUnueZI6m1CWtq2a/JTxIR/cfxl5RcZ+7xbBwHJJoKLhdC/UPMCgV6yX45 3sxOKNH7BzV1Dpw2Qbpx6g9rWwAy7fY4vrKu7meh0GM1H1Y9KMlHO/aXs0jr9RawCkyn r32w== 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=hHlbBJj/hHcbEb+v7Lo4LTxMgu3JyIJK3I2eynnrXOQbvnhA4+e6eFSnQ0y+C6K80O rNOb05Q3jlqvZt81OHhPIUphOU+jK8VLfUYwrOy3ow5ZDYANEVDDIeqFf8xTZqydQ2P4 uUWGgZ9UrX9yFyhwyJPVoFjzIXOD9ZjzzeWyYZfripS6UDsq9o34anpLfsp1pSN637uz PtlyOH5V1PDZxy0kGdTJ0+oRdDkJTN6oY8/2Gl0TxG/uqwgVChfp+lFFvEssUzi0luvz emoXaNg1Quf0f+X415nou3uMXmn9lP0227qPXYGLvSBLVI7kQWHBx/BhomX0pOCD0Orz m09Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="DMsL8W/H"; 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 x4si15769925pgr.120.2020.11.16.09.30.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:24 -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="DMsL8W/H"; 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 0250689FA9; Mon, 16 Nov 2020 17:30:23 +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 40DF689FC5 for ; Mon, 16 Nov 2020 17:30:17 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id d12so19570629wrr.13 for ; Mon, 16 Nov 2020 09:30:17 -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=DMsL8W/H8v62ShBaaWAxP3uZBR/lVSr8Xmtid89duoKrUS8TIIJJc8hjjHAzNkoaqV 6xl4sDIbSdq2nH8VZgFLXQYq5i/nD9XKKjLnmTVADYJzDnpYjTn/uwNUC2O9O/fFnVUk QrAGaz/FLDqVcczS7WhDfb0jI4hAhu6qCh3bidhiLGG/5hG35VAMD1+to2IBioYZrjpa OSWCxy0hpsJgxfIm3fMU15E6eAHDBXyCbUNl+fFkoyVYwfEYmVw5ZSzYCursf42G0E2X KphyNbe2w2DwCNofaQ36mvlqAuk1R8F546oYg/wa7OS3XjTuWwqS8LIgRk2zWXJ6uqMC DaqQ== 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=I1nJz1zLDo7PvCPc03TTyTkuHVi+DBudHiUB6w/8NUzjH6Lg4Oo51wTq5JmFFJvG7N 1yNulQOdnRqh0JxMpChYaEuzEX9UEFrnfA7Eky5YZuJR2IX+hTifeIjL50LDQHM2z4om D1lS9yCfqtRCABvJo4vdPMzB4HP0Z2NNFYQlpGC+972FAWKrpsFswvOl6iGSgOQ9vlpv YiiZt/kw8S1QZmPZZUaiIXa261hpycoKJnvnLCRUKsYCAQDugGI++MkHi5MypTqfRsp/ z4g5cnrxJx/EDwbO1G1hDNUwhKItvO37DnhCHzbfjI4o4+9NjGc+lAfa5unINDz5tEj7 NOVg== X-Gm-Message-State: AOAM530Yju/CCBQR1zx4gLWbbA19qMEbX7YOTQxf7z4pMt/afOLAKSlO yT2ADaPx3HmYInABItPsErXuGA== X-Received: by 2002:adf:f208:: with SMTP id p8mr19655214wro.280.1605547815889; Mon, 16 Nov 2020 09:30:15 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:15 -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:29:27 +0000 Message-Id: <20201116173005.1825880-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324418 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3497963ils; Mon, 16 Nov 2020 09:30:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBvNmhFs5ZNYX0fGYzOezZQd3a5dQQHPOpfPMw5oZV2qg+O7wIhI1u3AE1A1ASv34VV0Vy X-Received: by 2002:a65:518a:: with SMTP id h10mr261527pgq.340.1605547825346; Mon, 16 Nov 2020 09:30:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547825; cv=none; d=google.com; s=arc-20160816; b=TM8B1ITusJpuOtPB29KvCDdldO6JhX9mhMGwgM/ZrKUbgEcENlhKAt0vfpbDXAwFsa IBBe58qgnT/BfaVBwsBbzeeQbWXXpfe8gwPfauc3v7uZMnsKPIOW5z55AN+AOUAw868/ EGdpXHkHG0iPpCQV8nzgyrpi/QdGbneKISK448rfsxcf1pMdZpaj97YvwIJidmnv1f2W TK15ctMFyGNTv/8n4DqYl3oJboDEsIJQXkPcyzoe/srR7hM3/nuGx90MKnVICmxWGe5B WRmxE/dfw7/k625VxBM0TcRkWQuw+/4S+R4uuIbdmrh1nnPGl9o7G5p1klkuHpEd0ko9 t6Zw== 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=xLeLvbUi45DjVz3kv3ag8iQfcMa3329aG4D95vjKleg+ko7jwjSS0CNL3cznfw30qY 18jBzG2ZZlnD+uXglsKrPp5EaDcM4hqZ8HrtMgkcysDrhn1WsLEPopNl1ntJQidXnrq4 bagXNKprYgP8OZ6cnpyWTnCsXKpjrlBl/wcavZQQLygGYG4I2L2L3NJudt0FckdrQKt6 vctaULXAIPeHU7+eo/nshu3WVAsYRSjLgxyL2v0gaUzUAgC06UugZrcJoEmFhKXvPrux wfYUO10Xmclni15SGo40/HqSXgr8bdAAwkeXIWIZhNycCB8tScf3R5XoTZ6YCr2zt20l MZKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=lDIlK2xa; 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 j65si15542071pge.462.2020.11.16.09.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30: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=lDIlK2xa; 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 2370B89FC5; Mon, 16 Nov 2020 17:30:23 +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 80EB089FA6 for ; Mon, 16 Nov 2020 17:30:18 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id d12so19570704wrr.13 for ; Mon, 16 Nov 2020 09:30: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=XYd0yK/RTvMALAHwJymskqLfNpbt6qhOE1pCsWZvd64=; b=lDIlK2xaGwnzIz+QADs8o6Bo79L3RZPPz8VoCPoBcfthqdLDQPw8MO6yO/xZJQ+AvN U5FYXK1M9NtFYOSvrc03rX/lLJ5sDK8K2tvTxpIGRbO0hU2a7vA9kPMLM2Wx5pa1umgs SVQXaFlJd0LOiwLfm6Vd7w0r+4D6UUTOsWPfSwb66utl5bg/Dbb8t6gYcZlS4qt+QdZM GlUPfcUz0K3rMn550b76K6Y/hFA/KmzeM+nivd+0YckiZXtpuCvU8l6E333ACnsr7yxq Fsv/Ycmpzhi1MzqUT1drTicwjPwiKr9KzQKbIU0nzb4H6Zlxfs7g2AgD2lSQxi1An5vd DZJQ== 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=fj3eOidrUIrHLS2hI7Cs1qL0pbfSuTVMw/YoSpR9E56EyXUmz0kt62zX1iWUh+XGma GO5OJ/B2cINKBvgTOV1/THYz6mZPjlvpmhrj7IRUghWbaODgZb9c2X5GgImkF1zrw6PC /IvVfL3dhz5WhWGeo1+HxHQN+0THOGyqGxglyvWEKC2J/VBEzuNIR/5ucKsIw4cjKHsL a0K/P+2VDQxdv4mUCmehMAq0gUZFRarL0T9HAJDycDa93Nnjds3ywdsUx7IweXgYeged JBnHDRh00+SeJLuOPy4K37vGsGrzmBXcfTBdXjaFt1R4BJxEOg6x88LkqG01wBRZsZI6 75Ig== X-Gm-Message-State: AOAM531k7CKNz63dyzdwUzv4Ba41RB22u5cHNc9f6J75QDXrbLNzRhNi iIlxsNDvZ7DrsD+JYh8fAC9T5Q== X-Received: by 2002:a05:6000:1cf:: with SMTP id t15mr20965202wrx.92.1605547817138; Mon, 16 Nov 2020 09:30:17 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:16 -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:29:28 +0000 Message-Id: <20201116173005.1825880-7-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324421 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498021ils; Mon, 16 Nov 2020 09:30:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+PyjAqwwdi/+1rC2CGdFX/9TXbVkmKDusM8yfyjyFfIzdgvoUJZEOI6FLqp74GCPdNn+g X-Received: by 2002:a17:90a:d3d3:: with SMTP id d19mr1501pjw.0.1605547830413; Mon, 16 Nov 2020 09:30:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547830; cv=none; d=google.com; s=arc-20160816; b=YHsFijTZMcqhEGugRnxYDdh1aFli/96Gtme7uDmB1YVorV8s/QueP/g59O2RrNMgm5 tyVdFK/7U/Z18HZargLtzYyfDzaFW4voX1PSINRAVcvI3dy1rxkX6D/dzDrxrlXGeoXk VVFpDiFu0pFXXWns1uix3c8UfhbJbcTxKF4eToOZpB58zou01qN38ulSAfK3U5fLlKKI ZTHBi+x3Q+GBn10+COnAbavUf69oBkcLqQt9BWGyv+hX7T4Fp7I8GZTXzKiqdZvtJc1q OGDREScG+vQwFytHagFlIP0vWzgLdU4VH77kJDbzYRpDz9JInI42c8SnZKg5mGBkjZ1i r40w== 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=x8NixdSLhWeaUWyu7VPr7dvIws1sl931OsVs3ZCWSdpqh0BUAbMzPq+yzNomOZdeNk OTDBsVvuPqfVsH2WZ3AqCycfzCw4Y2d16ezJFHXPDpK7tGIWPqLvJ12xH7uVyJCh8LQL HIymEl1xp8hFKw8cg+AT/1kx8jUk0z/Xbm3NPZzfSnAyPvE/nQaFmf81lCWUgbjPrb8S X7Iku4i7cVYPpodllB0WRobJOJzeQByICSd00dbSg76boGdyFaVmea2noKZwi8ZeOD2X hrzWfrE67aEMZOoG1R9IPdwLAAiopOd+iTWdjNFWqUcq4Qx5GIYiIyXsC8HYtiTdsyGt Wa3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=qfvsLkNf; 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 r27si15793722pgk.361.2020.11.16.09.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30: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=qfvsLkNf; 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 C6AAD89FE6; Mon, 16 Nov 2020 17:30:23 +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 BD1EB89FA9 for ; Mon, 16 Nov 2020 17:30:19 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id m6so2429971wrg.7 for ; Mon, 16 Nov 2020 09:30: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=oQB5rAR+1+kEveAEir1T88yOeq9CZP66J4NDJ9xsMf8=; b=qfvsLkNfBDVcez+mP8sjEQQ2PAy0RRLcrkAePUGE8FPOg5SROKwYV7r3WaEAHsSl8q 82z1+lEhHRxnJWYkIyDvOV/SBBEbIZ5LXw4FQCkFeL6yTqDc0iJ7p3uHVcgvkWj/1K3p llSlffDSlSjk49XcQEMEPFfawSiO6P0lomMGwzZcl6YyrchqtiH15P9BE1jRABqhPS94 2oJz4PH9Vn3t5KP+9FtHMqRMCa1vPMBe5ituVb9WjxKv4gixjTE4YNYnMDSgRXv5ryhX bInIpfnWVcgCL0dV3+zAS9swCq7gx/SrASVAc85BqnKz23zIrOuI4k5cV7JITZ5yyeTo +FTQ== 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=E7Bj/W5i3vHhyG1t/btTu6l4vWkwigxNSjhnulGzVyRCYtoq20MtJic+EAtXee0hmB jE60cK3OZgDdmXXoeCIbdIZmq02W9jMpKs6qnVEXeywF4TV1wv0BvX1SnCM8a+HSxb/F JPptYOusz8eleQtgsxyMjmljyPOc/DHS0r9OUJb+Vxr46TKaFwM7rUeueWQbkqFCpw3m VXyngXlVKe2sAeHHx2XZ72HZTLvHP6z3yzfSb5ca28QWLYI0ALBHvyPklEvYupg4Mxgb aqbHJ3XQfS4VbJ2lCcDdw4dEC0VljmS4hbDJECMC1yJ5E2/0mo2XTxWJdtZlNBxzxNTJ khag== X-Gm-Message-State: AOAM530mb9pX6NSCwqgqZf+3/ikOTEUvwumZEpgkEktl18dz37mJMl4J KaAenxPHMTJ1Vb83aILNe9Lf6A== X-Received: by 2002:a5d:4e4e:: with SMTP id r14mr3868933wrt.308.1605547818474; Mon, 16 Nov 2020 09:30:18 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:17 -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:29:29 +0000 Message-Id: <20201116173005.1825880-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324419 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3497985ils; Mon, 16 Nov 2020 09:30:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwP2px+k6TX9WU7O859dSSRyWY+wdb9Q0WIhj6gi28ihduthrE/4VNoAvJ3LqV9Hd5khxLv X-Received: by 2002:a05:6a00:4a:b029:18b:3748:8931 with SMTP id i10-20020a056a00004ab029018b37488931mr14271106pfk.61.1605547827380; Mon, 16 Nov 2020 09:30:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547827; cv=none; d=google.com; s=arc-20160816; b=Eu5VpMjttmkP3Fcy/PIYzg0rnp9nDc5XNUeyYLu6TO8ITJTNnofEZl8EQFHxQa8cvZ VIWH9WLsTcqlmrQJKKgxMIyF1lDIH3icJfXTlaC39Se7U10bSt5SqckScB4kGnJXpwnE JodfV+GvFDiO7LL5oDJS0pXrWbXNXQp0YoAUvy1AQ7RNIQqdWAzq4JEU6ny/jqMRvxl0 +WgqkubgdYqV9Lw7jCeIps1CJ1Wooqf9p18/E7UysEB/mX6pLVdWOTnrlWWMrQCUZcu+ IsoKov8/+bTW8Dkeym01vPWlAT16C69+/JmYEz0gR461S72f7EHkh1xJjzN18kxao3L6 jSJA== 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=AKMIO1U1vs6nkc3ewuCQEpnZGAuIdQqOK/+J3NwwLu8YSZH3SgZQtNrBXtEBcHn4mE 3RP4E/AZDcxzxfs4b7dsy+7O7CVgh6O6q/gtRZkMgCLg+HNahPW1fVIWQpRSE8V/Ie4v 0lzFbPAVs6lkTJCUJjgsoDfXa/1oY3ocOp0vtrr5rEonolk5TXprpG4wjrk/1qLYSFe8 dMXFI/tzDQ6g9LTHiVkqdAu/DH30kjOanSf0FxBwxm/PSYxIldVdwDDcjlhGYsQU0E5+ /Rc+DFMevqyJnX55D+nJNB2+F6W8aKRNU/vuex8UefGC14irQhYYx3Evio1yf7uItwBA JqiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZBnRjH5b; 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 q19si15667664pgh.336.2020.11.16.09.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:27 -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=ZBnRjH5b; 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 749ED89FCA; Mon, 16 Nov 2020 17:30:23 +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 0BD1B89FA6 for ; Mon, 16 Nov 2020 17:30:21 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id d12so19570948wrr.13 for ; Mon, 16 Nov 2020 09:30: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=iZGU4hgv9ySSnT3lm5gi+Q8yFIEoSUWPQdVLIUJTRR4=; b=ZBnRjH5bHdD/fr6ODOIv3yB6B8MvWEu+w+dRaMNIJ4yj/v3SIIw+od+35JUs/9KuDj 6EvYZOlRHK6d8G5VJC6PLs36kwAf6UNWM/yp0+plhP0iT2JasQSq7sbtCZBmG7RW6I/y CPHErLD7H3mfTjWmpJe+4+Iw8jAixy/VmX9ZGE0ATZOsIOYh0HotctE6qn7L3M6MGr1Z +35D5kBsbJuc9PJh3i5k8I2oVKNMPpvyShGgTjIfeimqPDkzv8iOUMk03rUMgfHR0aU4 1EvaXPkzLiEBYvnXqyRSYdGLmg4zeP1xgEzByo1a2XjImHxIyIMaft1/2IqoHjk+6l9D oZnw== 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=VaYAE+vCJW5JMA4fo2ntxrzUGZ7wlCb2ZkTsckLR3gzNlTL+zV/AbanujzuG2/qnQ/ qWRtNZH7FOnMy6vCZpf1VKhML7ytOdrKjMcfEGjy5ZvZ5FXFAumQI6UzTGAAzpX2W4pQ Q0FrX5Fy11+zKKN396tb/3J5iXRZby8LhBmb88YyUxmGj/O+A606QKidDvc8umo35VKI Tajtf67Tc9YHoNTnASi75gr7YxFneguorySZ4ug39R23LlhAUAdnGQnpSQlnZxfjIYlL st2e3fpw7JwRzcJGbPlz6CrPtpTjzgMyu6BSn6PDeNplJAYXlR8Mv1Ct9/i/xgeyj8xH tZPA== X-Gm-Message-State: AOAM530mX/iWqZK/yLtn2OdqoKemqusTCrrlvNel1/t/HLmMAKmo4+t8 g9PF0OwWMsWYJcfMhDpzKGEzHg== X-Received: by 2002:adf:e287:: with SMTP id v7mr21598502wri.252.1605547819721; Mon, 16 Nov 2020 09:30:19 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:19 -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:29:30 +0000 Message-Id: <20201116173005.1825880-9-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324420 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498009ils; Mon, 16 Nov 2020 09:30:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAnifBfPRFWMdVsWzCbQakrTGJ3lRBHcO1zKgJM/vHPR3fHqEAkQDi0UpSRCxPXjye60hJ X-Received: by 2002:a63:5d64:: with SMTP id o36mr283484pgm.134.1605547828996; Mon, 16 Nov 2020 09:30:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547828; cv=none; d=google.com; s=arc-20160816; b=eH9p3WPDNESXeTFq1rKAL6IhlTxto+ZYQqg1z6FRmaPe527ffOMIC9QH3sYHc+pXog K2sKGPOSuqBMHxTDkeuM8BnTHFeibWR6gCG3DJBwc2LnHzs4a4vt592RelW+79BG1T9Q +1Cu58jivDvgPnSJge0s3K4heDpJLGCte0a7lrPOutm70gzmEkKs2O994Qlov7DcfOE/ rfWdHKZYO4YyknbYEvFURG7F/DXOfEXfx2V7MQBuXYGQz7uD2eedlIJ+KncFTFu1IBT5 Nbj8mQH0oLbwzyzfPzDFhlJNDXQB9kQD7GV9eg2lBxKUxjmmWh6PRQu3NPssZsZ5ZqLV JUiQ== 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=cU3dGbqYhlVFk1w9he0NlsYI1D08PB0M2VXtYc2FxGaaX24iv/NTKgMDNTAEZacudE oI9axpANlfTW16Oe4dqXNXmKn67CAS9hc8nO1g+bwvz0j577BNLO586pXgUDFAU+kjaP vl3P8o+XYnX2NsfswPHFioybnQYI7On58K6jo9E05tbBYhLlcrrRsjwNDDQ8PIofE/8b VNvmr2z3bx+pVv9fgSDmRSfuXN36D2FSWPzRhtPY6YHAT324YK95j/VXQn5z33dZuIHd txPR60gqbM7nTj+xd0KdiuUXsxr47CuDmaBOF9wlbiAlkhg526luElQ05yuVTn8zyBnF fZKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MH+f+Sm0; 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 a24si16822pju.3.2020.11.16.09.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30: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=MH+f+Sm0; 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 9402E89FCC; Mon, 16 Nov 2020 17:30:23 +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 3CA0389FA0 for ; Mon, 16 Nov 2020 17:30:22 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id p8so19623370wrx.5 for ; Mon, 16 Nov 2020 09:30: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=uEdGEUBcwEa3ohTuW8AeQ9rcZ1jBGC5RhjVmwh26pbA=; b=MH+f+Sm0LLQRTh9iWew0DtLlUhhW8oHlovfsPBNmPolwL17i7Gu6Fbvk6lr0xb8TD2 cQ9CuBZv66bQplnJ0/6Vbgdrj8mcy4+YI9UPVN0//u1bYGJnNVqYh7vKtey0uJfssem/ ijoKKyRzcP0SK5uRDsOYJAby+Dc+8P0hyNFUc5Ts4HY4BwTRxReA3c2KBHmXTfBS0Acb 78N1TWh8hkraQBZJxy6B4Llsw87P+vrg8vR8gnEm8yQ6n8j1j8zuLidX1kXjJMzbEDvx 10ZluVMeRVZKYM5BpiHMhQaJvnt6nQ/5NN3L8XLbLxM2sZ/uY/ALE4qjbwZpoM9iHlz0 I16g== 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=na+iY5XqVqBbh1rjqAUoCU6AAgXtDnCbGRdzJFn2LLqzW9p3jFi5U8pH10ip0OtXnQ F3aJjWn3nlJ1u8OKYQuiewbdQjMQUllLWeEeltRB0G5jgVpHBaROiDk0Ntm/bC3pIoc9 d5Vbg7BbGHBvqcq9riszBnX8OMR1goZW7Kf30HK7lLfBJhWW8qbQFrG8LaPAabJfolPF 2kPl+X1JHzUFmLzAEfnAJpuD+gBDcyHktZuUQPNJGFZvwHCeHEUhzFbm+YxlXMBGiTks 8lrI5F9g621M2kJEeFTsnCDBnGoFWY7ZxGtruLHmdsTYdOspESsVsF17jtmEpuIk9A1i vIWA== X-Gm-Message-State: AOAM53213YsJXH7K1kdyEszb96xQiLHOmUV7E0+tnFvdDaOnkswUTl/C NnuIv/u3LGthmZ/z4fAilDxVcg== X-Received: by 2002:a5d:690c:: with SMTP id t12mr20339054wru.405.1605547820954; Mon, 16 Nov 2020 09:30:20 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:20 -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:29:31 +0000 Message-Id: <20201116173005.1825880-10-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29: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: 324424 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498089ils; Mon, 16 Nov 2020 09:30:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjhfrTwhi0Db4eeRipRMQvS1f8lZnjiXX4Ck2K+gdHovieCiI8WhQ4lpMCxVlIdnVJoZb+ X-Received: by 2002:a62:fc4b:0:b029:18a:aa9d:10cf with SMTP id e72-20020a62fc4b0000b029018aaa9d10cfmr14811627pfh.28.1605547837047; Mon, 16 Nov 2020 09:30:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547837; cv=none; d=google.com; s=arc-20160816; b=cQQOIylIJ4enxlwyuxyVNqPrjjBIc9MFdUqlyL+m0K/hgRJbD/CjJHypQe71KzFBE7 PNYmxsUUt/RXblrv1ljm2BJY05u31gcIjJHbzMhoQ2uT69rO5x8tuVzO7LCu+FiOhghY +q+wz7XMV05hwLeL6ujOxjYKiO/ZdPRpS9h/tkB1DDqLYJk0M2Wz+MoPWvp9w3tJ6NtS M7qAoaAi0mWwRITpTChaQGHhtTxC4vkETJC76THvObuodaDYM2i8doW8APxQG+a+6nSp 6ptyb/xJTuxnFQpQHz9LdE8SEMW4UO18N6kDoTiSjejXoDQlUFiK6RvdaMLSCYsmcf5z 2Qlg== 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=juwbI09wTQZN7akcS/uJDW589E4r8Y4kZ+90a6egHNoGwD+iDlR/bg6xIX/io2YhPE DlL4Jyicka3wq18bLCBp72KQVSZsSF9nxGyBT8i5/xDGO9MdwF2m0TTlBxZmH4qzSAtn xBOFyQwmQW5zhear0OpWx9JNkprvbxizQI3zxCv5cVY9FmSqmvk6Q/6K4EkI7ubOCcHJ 4mDpX9IWFu09Sc0SMhvBzfNPm6RQjHr1Vr2auSy3gQ6/R4z6iToN4YHSux9yb/NpRtfT iV2VDvELafCDxV3SVs+xiRQVqFz+g7oWctCc2b0B0uCpHHhGV3ckBf+X+3J25uYuQU3B Jrig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=pUTGCNk+; 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 i6si17073914pfe.267.2020.11.16.09.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:37 -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=pUTGCNk+; 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 1CEE66E030; Mon, 16 Nov 2020 17:30:35 +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 1EF9889FEC for ; Mon, 16 Nov 2020 17:30:26 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id k2so19653090wrx.2 for ; Mon, 16 Nov 2020 09:30:26 -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=pUTGCNk+rZ3EaEHQY0/fTUeBO/p7mPxy9f4Bm8jCokpnyeV70DPnNhqKVsLCFt63Qm ACU7LOG3ZuIAbTDTAEgErIsdo3n5mMa1TPDxJYMJ0F6LOxLMP08OOvHhECSqSYdR9Q16 7wp/V6BWIfRWem/StkKdn86uo4VJzwwIF3+AY2zACSZecet+5atiCVlsYMeVayfSUwHW YaNFxHSJEsauHgPIhSH/lL8FkB7WTsnOzqFEpStfgZzP3Ux7Awcx6tvKgWEnqfSOsRt8 LMFGwwktx8/PZXj+AMwtyJWkVXLnsNO+ceVQlcHaii3g4UytHY9EYm/iog5OX/ir7/Fs JQDw== 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=baqPuRtcc+isZ15ytRFAzX1+xaasFCl7Omf2DkEjeo88TiD0Uv71dRivvQ6GK81fdd jMwfm1OJrrcFvBt2k/fH+FAe407h6ro4Z98JG2NdsbEA9KHFPNI136vwQawA1G2MkKUX nR8GWNdSO2YR9L8hatCayLCrnSq/xri36vw3uEBGgBVv117vL3eaa0gAK4OhUzURbBBo SptEcydd+tD8MzZVu6Ja3RXwELmQJDpFKwET8OaW+FLgsYOI1orXC+JZNYf35LztD1hS y6jbMC0QrkWRXhJLwi/2lVNpLeG4zg0wq1kYbYDAfb7M6qyEwqBuIN2fVuOu2npYhpZN DbeQ== X-Gm-Message-State: AOAM532JDvGw0Mtmmwrovvz/cmPymJv38fbM1LZhCZ63PNJTaN8Ia3aT ccwOInNSHJ72X7StAuJc2WIl6g== X-Received: by 2002:a5d:4588:: with SMTP id p8mr20546018wrq.224.1605547822432; Mon, 16 Nov 2020 09:30:22 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:21 -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:29:32 +0000 Message-Id: <20201116173005.1825880-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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:29:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324425 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498143ils; Mon, 16 Nov 2020 09:30:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOQ8ZApai/dT6ln9hlIAllpa0ZcYXzzWHL4qVIfejDdJII1D/PvRgJnoCKsFacTUz1r0Si X-Received: by 2002:a63:f50f:: with SMTP id w15mr208456pgh.403.1605547840921; Mon, 16 Nov 2020 09:30:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547840; cv=none; d=google.com; s=arc-20160816; b=cvk95gaviRzY0RS8FtcPBcvDV6OA9KBgC5Vh6J0dlzVSqEYX2EsRaYKlv9KndlhQIU 1S50YM+5Ry40v0ktda1YBeS9Hk2jXOsyMGZcJbSF3XGffrj+PNHi5g+jwcqrIN9VG2uD 7CIgyW4dN35gFmvvppVitfQmzpeOdBDMmjCeVaLdUZA2QPrWdqFh34apP/19ICLRhUuG vUlUbLMjfMvcr5MFe0hJH0ap+wMO1xRyw9Wap5byVsVtvIPJWqRHODxmAitcdirlNh9i thqYCMkkNA/50FtEF8zKZLyGoVimN2fhhv6fiXbSoeMleMAFDaTc5B6zfufU3aJxfpaG JXJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=OkcSi6CA0//B7r4vsToNiGTKxIz1hdEQJa8LObwrKXQ=; b=G2RWPy+QGk2/vvilPn3VItOzHSD1SJHnsaHM7ENOwNG8hR7j8Ib3hAE475Ez2t3Ux2 DzzkQoO97Zbx1/Vaeizy9unp6keNHTu2ce4puyC4fltDVUapX4bR4LznR8gUbGBDbkt4 hL+fGZYXYOkkrSoI1LQ80D+FZw8vJqWwXLcCQlbeffUMeYZ0va/Ay0ID/X5dK69PIvV2 GPbflfiZUf7rUErtjltL+ldgZVZLyu0sYpvm1F8yeXWUNkCXJsIYDNVI4DeVCCj7tdZB MnnZXCS8uRGTMkpGtG100f/aenbKPTmy71Pkyio50wYucpoqd9jv34oPHoYAYEkhZ6Ut lwbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="mk+//APT"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id i10si15835472pgl.132.2020.11.16.09.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="mk+//APT"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D68456E037; Mon, 16 Nov 2020 17:30:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC1A589FA6 for ; Mon, 16 Nov 2020 17:30:24 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id b6so19618187wrt.4 for ; Mon, 16 Nov 2020 09:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Em7SluU2l3ftJ+gF09xUH3G2q3trrqCt+WUDKP2B/us=; b=mk+//APTyPDZh9XKgwaFWLCLR0i63D5KO+mrf/fczt5j3iHIWaWmHSN9hpuKceQt0z /F4Lf873Ni/jDpPGpjZ66Yt529P0Pync7BDAyLV02jsKJiLKh59oQbuj1f1xbES68bQ4 XGTcqT0BnX1D/wo9PKt/cuUcfPmfhXYpxa7qYt42+HuQJIgga4xVfISU5ualkWcDy2qf d13FYI2/NWmwXFeOI8V0Rc4kk+wTQe5xDGbgNBJ7Ta1ww+vK5JKgri6EvuA6EF95szIV 2db48IppAEgbC9ueOh1S2t1tlCaKf5BW1sRepPAQd0mSYrF5Cd4HtaBsqcaOoCon6W3p LfXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Em7SluU2l3ftJ+gF09xUH3G2q3trrqCt+WUDKP2B/us=; b=CABNYCvWPr0aIYL2I0FoKewuctc1DT71UmHPxhjZBn1YGfgGHADG422ItwnIL6sC/I z/Cb+8+5VNjqaPC8fR++H1FVtAsrUkRRGWrYDqkWVxjH9+L4c0Ye7OM+gniXmZAklj6R xXd7HgQm6sB5SbMvb0Z3mCNdddOvbh81duf0jSAOCDoS1oPvl270ysGwPaZ0+OiPFM0b QuL6r5zSWdHyIwO+HXJdp7ON9QKBY3BHR7+DRwEQtUiGkTba2rT8evXvFy4uQuSP+X+S 4q7wMptYCrRpOY3vBR2T4rg4/Z2897UjIfvSGf2XWYE//S01SN6PbglgkoI0+TiVfJ16 xixA== X-Gm-Message-State: AOAM532Qba+c+t72gEhLfUpC7gbFJ/F3eUNhCVX+AxSlkwPDxrRXxbmw qUlnTc56R8GMHo+Y+o5nmnn0Zg== X-Received: by 2002:adf:9544:: with SMTP id 62mr20166979wrs.223.1605547823586; Mon, 16 Nov 2020 09:30:23 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:22 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 11/43] drm/radeon/radeon_audio: Move 'dce3_2_*' prototypes to shared location Date: Mon, 16 Nov 2020 17:29:33 +0000 Message-Id: <20201116173005.1825880-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Slava Grigorev , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/dce3_1_afmt.c:30:6: warning: no previous prototype for ‘dce3_2_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes] 30 | void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:48:6: warning: no previous prototype for ‘dce3_2_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes] 48 | void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:66:6: warning: no previous prototype for ‘dce3_2_afmt_write_sad_regs’ [-Wmissing-prototypes] 66 | void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:116:6: warning: no previous prototype for ‘dce3_2_audio_set_dto’ [-Wmissing-prototypes] 116 | void dce3_2_audio_set_dto(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:170:6: warning: no previous prototype for ‘dce3_2_hdmi_update_acr’ [-Wmissing-prototypes] 170 | void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, | ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:202:6: warning: no previous prototype for ‘dce3_2_set_audio_packet’ [-Wmissing-prototypes] 202 | void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce3_1_afmt.c:223:6: warning: no previous prototype for ‘dce3_2_set_mute’ [-Wmissing-prototypes] 223 | void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute) | ^~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Slava Grigorev Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_audio.c | 12 ------------ drivers/gpu/drm/radeon/radeon_audio.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 8c63ccb8b6235..f6c783e19c988 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -38,16 +38,10 @@ void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); void dce6_endpoint_wreg(struct radeon_device *rdev, u32 offset, u32 reg, u32 v); -void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, - struct cea_sad *sads, int sad_count); void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder, struct cea_sad *sads, int sad_count); void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, struct cea_sad *sads, int sad_count); -void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, - u8 *sadb, int sad_count); -void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, - u8 *sadb, int sad_count); void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, u8 *sadb, int sad_count); void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, @@ -65,8 +59,6 @@ struct r600_audio_pin* dce6_audio_get_pin(struct radeon_device *rdev); void dce6_afmt_select_pin(struct drm_encoder *encoder); void r600_hdmi_audio_set_dto(struct radeon_device *rdev, struct radeon_crtc *crtc, unsigned int clock); -void dce3_2_audio_set_dto(struct radeon_device *rdev, - struct radeon_crtc *crtc, unsigned int clock); void dce4_hdmi_audio_set_dto(struct radeon_device *rdev, struct radeon_crtc *crtc, unsigned int clock); void dce4_dp_audio_set_dto(struct radeon_device *rdev, @@ -81,8 +73,6 @@ void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset, unsigned char *buffer, size_t size); void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, const struct radeon_hdmi_acr *acr); -void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, - const struct radeon_hdmi_acr *acr); void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset, const struct radeon_hdmi_acr *acr); void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); @@ -90,10 +80,8 @@ void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset); void dce4_hdmi_set_color_depth(struct drm_encoder *encoder, u32 offset, int bpc); void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); -void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset); void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); -void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode); diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h index 5c70cceaa4a6c..05e67867469b0 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.h +++ b/drivers/gpu/drm/radeon/radeon_audio.h @@ -81,4 +81,16 @@ void radeon_audio_mode_set(struct drm_encoder *encoder, void radeon_audio_dpms(struct drm_encoder *encoder, int mode); unsigned int radeon_audio_decode_dfs_div(unsigned int div); +void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder, + struct cea_sad *sads, int sad_count); +void dce3_2_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, + u8 *sadb, int sad_count); +void dce3_2_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, + u8 *sadb, int sad_count); +void dce3_2_audio_set_dto(struct radeon_device *rdev, + struct radeon_crtc *crtc, unsigned int clock); +void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, + const struct radeon_hdmi_acr *acr); +void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); +void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); #endif From patchwork Mon Nov 16 17:29: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: 324423 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3498074ils; Mon, 16 Nov 2020 09:30:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYm5vsfRiJxpW1fvn2snWR6aKuAKPnvUUMwVFP/N+/wl/Quu9vprJmdBJZSXUlea0IbeLM X-Received: by 2002:a17:90a:ec04:: with SMTP id l4mr17313660pjy.131.1605547835560; Mon, 16 Nov 2020 09:30:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605547835; cv=none; d=google.com; s=arc-20160816; b=AL3N9G0ew5L84EkLYaplB3S70C35ttFOBr5my5pBPPIBTCKxH90OrHv5wvU2rmEA7Q l5EwMMGL+DfgVishqeN+oBnhTK4nxJ2H/A7tVOaVglyRivBpXHWKVdemvZr1fHNeP6ei 1MyO+d/MvAmle5CX8EdUheof2bpJeJFdN6i5TU9ETnBmqNahuK/ZW+Gn+qWhh/0n8j3B hJs8fGDk0vbesiNfb047jDHaKF/SZl1GGNSsGTyXBmVx6382BzKQJrPPCIZZHRAI8H8G 993/wQHYfr/9aWWuYVPt70ZqYLFkLTSHj5+Ua+jBt9imUf3DeJon3f4VbSZBwDPb/v6l 7Hww== 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=pJ6z4bTsyp1ZzGyLKTph8Qnviiq5TJzoG+MMPMFdNlIx1vzPZs+MKMuEkBt9iQ7ZSQ 5gfgnkyXVSRlyZJoRvA/R54vhfRAtKcRKTjXh5fwgZJOGT5QUu8GUozfPz50cQ8w280Z TYnwS55/lYSKsvw46nw3ZbvdUvOoEyDp66kbp5IYPMz4XwcJ79/QNJU7KZ0BvvCBKUoF 8i4pGGQYfeTg+w9awEinUbe4S3EPZY1AaLmcqwM24gXeMupd0UNuG8eue4lPvVouA8jW eJauHDJveSnwC1jduYuTn6hHO+eCyY/1TrWlIo0oqUP7EwSvyFJm/m0DSqLq+WT+kQcO 7gXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=o0MK8Nts; 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 bv3si15855333pjb.157.2020.11.16.09.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30: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=o0MK8Nts; 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 44EA589FEC; Mon, 16 Nov 2020 17:30:34 +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 B68FB6E037 for ; Mon, 16 Nov 2020 17:30:26 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id w24so18362wmi.0 for ; Mon, 16 Nov 2020 09:30:26 -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=o0MK8NtsTRs/ZWz0Yv2EtePitO02CnYQar/CZQCn4okitC87ZYMzK2zZrmhKuM79DQ yWHkkAnv3yEhErOBgXePkRZbAuLotBk01S4/LzZMkX7rRpPxGYkZB0jT8G7AgYAXDI/H AUhgqt9aiVuBzr9lOK5CMDB1SMCEozqjoY5Wzls4cPHVNSTJlbmoT6cFL732JB/OVVV9 r4mlyw5yot9EXfwmVbzFMDUsY5d20uf4+engxelKmyKd+fYik8jLOwWKK/FpMvzzP+iH 84t3hOspghWPUWu2vQ0bM+QoXtPkyT7qn7qF7QrX1wZFutC/dukTugklJGpHrLgIm+cm CC3Q== 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=PIS8kX/ntI7GsrRjUxd2FCgjBQu0BaemhgG+qmIwZ/USL7zf6gGyl87fYxJ1Azc1uT laF8SRlQULlpf4NhW0YDMMDdBMkHsiszpPMAIOgum7k4XS7LfL96bY4IErArK5VfmO58 6zp+b4wIPhCI5z0S82UZLFCve3HEBjr+jNkcSfj0lk8zywHzdembr6TeaIMNb7JMTl14 gTl7p23iPk9mVuVhfI0eM0Fpkt6CqIwZEXvEKthypY4AgfT1LfMgh055yVANk8MI0nVk KayixcTL8pSiKrg4A0jXMaQCtQdON7vZOhNXZ7jApiFTo499Zx3s/P/9kWt01mH2kYdH zVPQ== X-Gm-Message-State: AOAM5301ZHEpJXJ0SkVu5uF5nFwbYuEvDPjGd6LNOC9QtExGreaT2GTO clNnxo7rQJ8VwKsvVauH2lRx2g== X-Received: by 2002:a1c:d0:: with SMTP id 199mr16366893wma.148.1605547824855; Mon, 16 Nov 2020 09:30:24 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id f23sm20054854wmb.43.2020.11.16.09.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:30:24 -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:29:34 +0000 Message-Id: <20201116173005.1825880-13-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173005.1825880-1-lee.jones@linaro.org> References: <20201116173005.1825880-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , 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);