From patchwork Wed Nov 11 18:35: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: 324126 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622804ils; Wed, 11 Nov 2020 10:35:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHQr40hhhIanu+95RnxVH2ObVdYlpdEc++j2MFchEdgJHFV/1s6PljFtw426TSfOfahpro X-Received: by 2002:aa7:868d:0:b029:18a:ea7b:342f with SMTP id d13-20020aa7868d0000b029018aea7b342fmr24815828pfo.68.1605119755895; Wed, 11 Nov 2020 10:35:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119755; cv=none; d=google.com; s=arc-20160816; b=C6BlI+jxukCFRaxfbmgk53nOmNLlCCQt4hqxQkTdPJVfVkSXeJd9jC5cCT2K4sEyz1 T0SN6MZxXeWiMVbWjcsn2mlDY0o6Hjjs2uJoF1Y1JIJnOzOoSrsMPLz+CJauopF/eGn2 9GOnrWlq3/D/qLFivOEdGkOVFRMoKtZnRNn1nwDZxwCCKfeRSWmNbvqJlg11OyBg5rxy rCtpQNlBvTG/iytZM7Hf8eqJqSvyKMK26HCtk2p1LrR4+TdzUxe59lHA/Oro+4uJKeAM atPKjTl+d9KfU1kRj5Jj8jP/xVV93yCrVIsiljfFT2nWLeoR4KDjouCp19GEVHqbiPyB c2OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=86sAmQENKMgvSKj2XmODtweIyU5jZpvlOLy2DSzsRqI=; b=r1LSSLcDMOEKiLq/3evHH7nh/rfHoill9BZ9z+xTRoo+XBRJ7dBZG6KghaiuNO81Tl NOphnN3ovVtDp0AJZ3nC/yk/AFvKBPph+lFUYVnZC12w+0r6Y67jntghlenRvfhj6ED8 fheRQJWU5ZNfp+we8D+jcLjzXZbuFslIiDRrBwgTdgIjdaU35x36QxUQbcr8zzCAnLQV kn08ucXo0P4pFgi3Uz7dZMBuicuiOskahN+qF/9/bPs0KoqZ85+4WjkSbiMA4V3I7Kop kBXLAEz1gz4ut2hXpbn/p9sh3CvYkPAJqGTa0TWWgpszfaSdTt9WpuZyBZi1MwHNjBO3 V5Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HbkLuQQi; 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 d16si2451235pgv.389.2020.11.11.10.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:55 -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=HbkLuQQi; 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 8E3F688DE5; Wed, 11 Nov 2020 18:35:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 718C66E0AA for ; Wed, 11 Nov 2020 18:35:51 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id c17so3464150wrc.11 for ; Wed, 11 Nov 2020 10:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6eWjxCy1b/Di1KDbBj5VEEMSjXTSXChj8189ArvQtHE=; b=HbkLuQQi5rW0/qhwunU2WW0FWuIMpOuK3Lb1lXqJZZqhFtQ0WVod0F1XFBZAthXUFw xXjyvXMBZIRfRPFWIjgVG0uFcAr87Ios/o1uGlsFlq8jACLRAWaIVyFNN69wwgk9Zl2J S7bhRfZayQLJdGensl6yesXvZoW6r6n4AIB18Rf4uu14sXEjeZLls+85JlR0x3kbjoBw DVJiPNOPJBi/2wGU7f6bBKz3LrP064hHZLM4zwvUoWbIdxKFNJndlornfq4m5DDsge7i LYzgUUvQislNFuJvaZVzSwUp9v/HcLrP64p4YEne6oClTQ+ohO9SvBG4vrLMVB6r1P2J veRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6eWjxCy1b/Di1KDbBj5VEEMSjXTSXChj8189ArvQtHE=; b=dCAoXtv0rdDXUR5/vxqWlckjrdnUvwLlj/Bxbf+R3s6ZG0aeMXrLxGvBSIxOttVhVJ 3czDR6d43m2ZdLJDZWUqSPJBo42Z0B8je3XGvbv23+p4yvPVEmh8CIE05X4RIdxIcHnV Xo7HFUBopJehs+lrV+kMPv807W/QJOSgcWem/O4qC9bm2+aa8Yp+w5JLOjyyF9M9YF/W KN4y/NVMzELi7tEC+LIlJCXInJPo/Qzvu7YjU6mydAw6qdhqW0Qv58nKgb2HS46hO54x Cnxq8qyzmMpL7sDA8svqVY6LH3WVtLZijRB4l98SZejyoczxvuulqh5nGuP21kBZ6wpX DjbA== X-Gm-Message-State: AOAM530Rx5ERfq3Aov0CoR11pBfnAqZNqgHX36I476aX5AeK1ksVGNKq bNszaCtg5iE9IgZI24rA0A2cSw== X-Received: by 2002:adf:9124:: with SMTP id j33mr30438227wrj.376.1605119750054; Wed, 11 Nov 2020 10:35:50 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:49 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 01/19] drm/radeon/evergreen_dma: Move 'evergreen_gpu_check_soft_reset()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:27 +0000 Message-Id: <20201111183545.1756994-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/evergreen.c:3825:5: warning: no previous prototype for ‘evergreen_gpu_check_soft_reset’ [-Wmissing-prototypes] 3825 | u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/evergreen.h | 1 + drivers/gpu/drm/radeon/evergreen_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index 30c9ca99ced90..eb46ac7776951 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -47,5 +47,6 @@ int sumo_rlc_init(struct radeon_device *rdev); void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); +u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c index 767857d4a8c5c..52c79da1ecf57 100644 --- a/drivers/gpu/drm/radeon/evergreen_dma.c +++ b/drivers/gpu/drm/radeon/evergreen_dma.c @@ -24,10 +24,9 @@ #include "radeon.h" #include "radeon_asic.h" +#include "evergreen.h" #include "evergreend.h" -u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); - /** * evergreen_dma_fence_ring_emit - emit a fence on the DMA ring * From patchwork Wed Nov 11 18:35: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: 324128 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622855ils; Wed, 11 Nov 2020 10:36:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVoFLtxAFpW7dbjJfFAskQEVgq33PwOkQxGDyRyhH81Mp0LRmfuMXofC07M556yEDGwR3d X-Received: by 2002:a65:50c5:: with SMTP id s5mr22680560pgp.399.1605119760914; Wed, 11 Nov 2020 10:36:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119760; cv=none; d=google.com; s=arc-20160816; b=ILCnERS95BeBJ5b1dgG2zxC/iemJ4yJAL1NBqLw+ZkmyBXLHQunVLqWOadmA1lEYFo AGbk/dWSeu62AxV/sAD6PD/iPTyZz4dJFYF57EL+XvTjjak3pVcMDfu+xMpCZlCtMaN+ EJaUUs/jMNd3B4OhSNgdLbq0czJxJElOFry25jGuE0OIQgCJsP7hc7OIT7CE1PgxT29f njg3LLFiUzufQzCaqQVZgE5lrqAONm5aAcYVcr/Cev/akSfIvMDyCbncnFoiStZ8plhH wI7HoGXRQ3vc0yU7GSGeQu4nCr5GfrIX7GwRdNnxb7c+sE04fVToiDbl5slGhLlhsgDV k6jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=aWCjRmlGYkhmYN2qNXDv29hF6E6fBjezzKEW13N80JU=; b=p7oxZoXVNEKNQbm2NUytfd1O9U0uokqd1eAKF531Jf/ObKBf1oChbeyFvNCopJ/MR5 RxJwb2Du+VupYBsBEglYNdud/Gz25qEoE13ZPIPDdUDT/PVUt/l2Q9Ip8wiuovONGrDP DMNbPltk2EL1AxkpC23cQNUy9Al6V10Az6sEPaGfneeBSk9iNyunH57ApGZgMe2+QDAt LfDuOwCljhMcXx9T+yfrpShO5yBDptYsHzUb+2O0TU/QH8egu5kaNBcjhWHzfGQfV4rv bZR8OpNUAyanefuAC/TU9DneDQSsBQftr7Rz+W9MAvAHZBI+bfWiESpzrHRzrlkMBmdQ rodA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=pZ+Qh5Ir; 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 s188si2450266pgb.6.2020.11.11.10.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:00 -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=pZ+Qh5Ir; 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 AD3496E0B6; Wed, 11 Nov 2020 18:35:56 +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 B9F076E0A8 for ; Wed, 11 Nov 2020 18:35:52 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id b8so3528477wrn.0 for ; Wed, 11 Nov 2020 10:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pyNxvxME2tG4MioZh0DLPpucvuaAdYEDiX4yy0UM7tE=; b=pZ+Qh5Ir0/lUkjSQsdZgT0qNsnE0Kwon6ayRY4sx+bJ7U2t95+wam8fCVcVYBQy3hX AuDoAsSXTh3xeuT4E4r2i+u0RRFD1EiCY9T3C0Xgkq8wSfVcPtW9PVHnim5Cnp+zsmT9 zz112QT7ngXkmeKYTV3biTKexdGTYGHonT4el6Xo2iPzUX/ZkfMN3Du0t7dd80eMKzZP f93rAUQgaRHJzbR7P9KIZYs5AM0iFg4IUBa1MtgtG3Q/Owj5iXYPEx9PjJBnC5zbS6C8 xR3zEPCXFZNsjaNtqFCbfMXBHlp+C98S3ZNNEW8ePYQAYo/iIenIqSTFaMe9Vs6uQnEw sEYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pyNxvxME2tG4MioZh0DLPpucvuaAdYEDiX4yy0UM7tE=; b=eluTqR7YOQRKS2WOt9VvmqpOtcIUTsFrmZLXPpuIpfnjf+ombsP0XJof09nxKi/qa9 +hCcjkCzegaSE8/JZeUYBtDMgQMt0IH5xjfOlNbL1L6fn6ziiuicuoPDGZ+QcBGU/XrO v8hX4zJxU4JTUCliUS7MPLWEv/rMT1yt++wsAIdzXPh9b5x51KtbfINffjZbrDZLyBty QOsw9jHFE8m8TncsXo09iR1M1UjukN6L7pIV6RaQpX0eMZoEP1nf08nzEBtzDOk0bmgp lwKGt0aPxRPFmMkP4pMV5kO79auWrYl7xBngkKVQPQhl9iwclzTRdJJeu1YCDYVxmjp4 tPcQ== X-Gm-Message-State: AOAM533jRrWGrcWe/Fcvg4VWHxnoM8iGxOsq9VoWZ99Df7fAuF6b/5Bo ppv4YcDO1BIlEJyuNR21DKwwVQ== X-Received: by 2002:adf:de91:: with SMTP id w17mr30549664wrl.84.1605119751376; Wed, 11 Nov 2020 10:35:51 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:50 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 02/19] drm/radeon/r600: Move 'evergreen_rlc_resume()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:28 +0000 Message-Id: <20201111183545.1756994-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/evergreen.c:4380:5: warning: no previous prototype for ‘evergreen_rlc_resume’ [-Wmissing-prototypes] 4380 | int evergreen_rlc_resume(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/evergreen.h | 1 + drivers/gpu/drm/radeon/r600.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index eb46ac7776951..f8d772e612a48 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -48,5 +48,6 @@ void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); +int evergreen_rlc_resume(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 94e8815e5067d..b44e0c607b1b1 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -39,6 +39,7 @@ #include "atom.h" #include "avivod.h" +#include "evergreen.h" #include "r600.h" #include "r600d.h" #include "rv770.h" @@ -113,7 +114,6 @@ static void r600_gpu_init(struct radeon_device *rdev); void r600_fini(struct radeon_device *rdev); void r600_irq_disable(struct radeon_device *rdev); static void r600_pcie_gen2_enable(struct radeon_device *rdev); -extern int evergreen_rlc_resume(struct radeon_device *rdev); /* * Indirect registers accessor From patchwork Wed Nov 11 18:35: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: 324129 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622884ils; Wed, 11 Nov 2020 10:36:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlPVjhsmOxT/4bgo5hVqtMWU/dQGAims+dtdQgrNAoZEl58nyzM+KlABGciti8LsAmVVXz X-Received: by 2002:a17:90b:a51:: with SMTP id gw17mr4805869pjb.218.1605119762730; Wed, 11 Nov 2020 10:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119762; cv=none; d=google.com; s=arc-20160816; b=c05QX1hrpgCnDR579RjrK8JlX1l/jQF3neMzC88N+fbm2sptU0Nk6qB2HCjXsyiZAt Ijh5XgK72vgZx5bFFpV399eLWAWSZAWpCpuDI6gSIAARdfcTIExc07SGMT0o0Uf6XRib 9sJjJNfMvgzlTNHuQnEo7qCug2cRmdejWvpfO6AcXQHxSkuvT2C561c2bYl4JF490oKJ lZptSfQIGzPU69Ne8j0Bk8Z/H5kwkSKfBSzmi+cB+iJSCvhrJCF46KN6jf0n+2ay4naU UYkhy4EyWHjDUh1cb2zlGnGLYNrubEREqxhiW3ImSF5Gzuwu2a8/jP7fdYm5zOrXsMrY sBtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=gW7AqfMy32rPZ29FajBndYD0OykcaUKA4oPpUUPGMjQ=; b=VYm7MfcaGO8b3GjTAPt8vDdXEcLI6dzc/bSvfbAnPrnxLyTivoGwGxwP5vR/r+ESXF be+wGUC0XbWOhPgjLLzvCOk1dNgeHVU3/7SxgGLryFI1QzeWdYeZywJMfx8MiLlJNKLE KGTMraEl4Ua9vL/y4Lk6U09TA/CJFXDGLl3zo2aJd/Wll1pCv6ub7TQFcuJ9Hurw228z U9J9lCinbrGJedgO7r5tybLNw8D/3uikwRiS/+UKq/B+cyEk/8Gh10s1Be/NDIHVJwyW fNkR4LT7DxVWk6cc/YsOxwRbKdnjPBOBONA6DTqq8joessi9YMZRmsZZ/EZb8vDf2hGG er8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=uzYnXdFF; 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 g1si2583688plt.54.2020.11.11.10.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:02 -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=uzYnXdFF; 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 BC8FD6E0AB; Wed, 11 Nov 2020 18:35:56 +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 F13C46E0A8 for ; Wed, 11 Nov 2020 18:35:53 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id o15so3514449wru.6 for ; Wed, 11 Nov 2020 10:35:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5TTguyaQuVrd+USo/F+rMhw06NLnXmuljJDk3k933AM=; b=uzYnXdFFpGFm/O/yOG8ZnLUAwCXGekg2acMZNKqILkDN5/NpAh6cm4f6K2dqKdkJSn C7NRB6cZlnNl8hSwWeBmI36L4kdkOL3H4CmV87xjGW/FpXfExfTEu8a45Q4Y/V243SnO qGFS0il8RaTQOfwdfzUBnRXSabA3COE4c7YFG+yDuJ9WBCF9rBWj8yrEzOrUgjnQapnL D/WJ/RQQOsJ6t8yAtJBi2DNUPyxK5rCNaUWcRyoqXBo21obVwGHtq5ZrCENObNqe0lN1 3qjzGG56Gfes7ebdpjzYG1smr2Tp3b5vwvffnIt63DYfsfYCIuVGakNbesczuHou+RCn /xOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5TTguyaQuVrd+USo/F+rMhw06NLnXmuljJDk3k933AM=; b=TEhNn4Qb7Y2baKeOIahMLYkwZ/R60FNgfnqOqUXKTfZRQDX0Bm3FtHyZEhM0wjCUD8 xF2lcT2+Ic8XriIGCoV0GFItyt6tKxcM3vKE1GwpCcJZFQS2JQNd3TpqohyHWgrgnVdY IQc6lEYpD6drHu2Cvgh8jrfTw1KmV1NLuUABQc4GCGTQ9u9Bkc/wPGCLIFjoJt0ogxxD c+5v5r653zzYbBDpDfvCBbpmIm7Pm6pERN9ORqJVfpBlLwZ9vsff8GCKv3rqPmyMoOq5 fE5vCmm1yfRNBCIbHEaBa1+BOnn6xUVZAqjlw3tvxZJgUzInsN1YZqa/C1AW28fEbEzA ngiA== X-Gm-Message-State: AOAM533Qtwd5R4Xvmvxs2lvhch2G8ZdAXVCj3skNNgkmeapwcNDCDa1Q r7+xf7gruaPvFC5mWZEloNu20A== X-Received: by 2002:a5d:6cc5:: with SMTP id c5mr31747759wrc.301.1605119752670; Wed, 11 Nov 2020 10:35:52 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:51 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 03/19] drm/radeon/ni_dma: Move 'cayman_gpu_check_soft_reset()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:29 +0000 Message-Id: <20201111183545.1756994-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/ni.c:1733:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] 1733 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/ni.h | 1 + drivers/gpu/drm/radeon/ni_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h index d63be1c88c0f1..9a5f31a05e68f 100644 --- a/drivers/gpu/drm/radeon/ni.h +++ b/drivers/gpu/drm/radeon/ni.h @@ -34,5 +34,6 @@ void cayman_cp_int_cntl_setup(struct radeon_device *rdev, int ring, u32 cp_int_cntl); void cayman_vm_decode_fault(struct radeon_device *rdev, u32 status, u32 addr); +u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __NI_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c index c56136848360e..bd515ad4fe4cc 100644 --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -25,10 +25,9 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "ni.h" #include "nid.h" -u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous From patchwork Wed Nov 11 18:35: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: 324127 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622841ils; Wed, 11 Nov 2020 10:35:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJySziPRbGCwCsgHSfZR0cj0L0HR2GxX3EsL6PGrvs8oJJIrX/bP2eTAcb3HfxKVMphW8wqn X-Received: by 2002:aa7:9f5a:0:b029:18b:594b:fb6c with SMTP id h26-20020aa79f5a0000b029018b594bfb6cmr24875008pfr.45.1605119759572; Wed, 11 Nov 2020 10:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119759; cv=none; d=google.com; s=arc-20160816; b=QB7WlgPFlQGzI0S6nLO5As8hBdUZPlJC6V7I+OY+jLk0FB6sOdgUFnxi0JINVSkozs odkwT+h1EBhsXuxNhggSF3GnHH4RVV+yXz8Ka6rgLzOKNaAI+OFczYt+EsGN495eZReN BsWwtqDekUVYi6uJgLxfCXEnUVgiYJzezvpE/VIQRsGm1ZzctcuFHfaeTEy55+e6lgJU wBQDHv3CVYEYIuS1erm1NIvhsCi/48DE9XRZMPYcjcke5x4G+Eb/onVusel2kzA0O606 tUOjwAlGTXkASGblKx9YvVtKMuSLv+QCqulDrhe8L8LD+q3JE2dvXOTa6LL5fpcs6Dd7 fXZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=6WOsltnY+D0CuXNrdxx1fcTV9NNf7nvbmHjf+SVNo8E=; b=qGIRdH/rSvc8mpjsCGHA68aYA1GwUl/0dwN//Ovql7Abq98nqpdFG8ICiqdJNP7kXe Z7CG6leUJoMoUjYqMa5lzAOAAZnYA31kw/Pp9YWY4gvD64CSLCmEW/IJvPeFlSHyqr9R PRHjbFVJRg5S19r6Eg3ddL0VvGJ916mA7zUMxooNP1H2fjVahFhuz4qkTvlxmtwlIafw G3jaxolqRkCXU9Dr69qNEn0F6Zyph0zMkLkxhEmE83VETbzV3KIVxpWXxbKG05cAUHQQ /dcBMFCtcc8OjldwkV2XqjjFBY7Qj55sDEc8Dh9FQnbIGTpJ+mb0etkv4BSFi7soDvu5 6rlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=uWL7G87a; 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 t3si2573103plj.0.2020.11.11.10.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:58 -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=uWL7G87a; 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 9D9316E0AC; Wed, 11 Nov 2020 18:35:56 +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 57CAA6E0B6 for ; Wed, 11 Nov 2020 18:35:55 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id k2so3527974wrx.2 for ; Wed, 11 Nov 2020 10:35:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eP0WyWZg5ruAlRDHyNqDbB7ackT3+aNOib1WfADr30A=; b=uWL7G87ad8BBVCkHBLVEpHZDR8zZqKdyrnOOfcEpLPyUY3xT+ts4pkohRGIbD+xnu8 /Iz+STdZtJMMEoeMJaIhC356yaZnl6WUZGi47iCmWDzKV0Mu+VkcfBm4HTxKQ+RO0KA/ HdkdQwGyTAqbmjccN90fWErcuo6zeYrO+h6Da6EK+C9xPXHLyLa6YAqONl16i3IQEvcU +3siVCh0rpVbt1upZqzW+MliM3OXB0129YlDV3PAHMl9JKSAwWTt9rrH9aI+w81zgyCA ulk7nZN40BMCJdrrUgJPMrIoFuerGLtgVecgPs39c3C4GsMjHzKzET9sK6WY6ikVhKpN dn6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eP0WyWZg5ruAlRDHyNqDbB7ackT3+aNOib1WfADr30A=; b=ZK0xrcnfV+5U95UDQErvWB54QKdrIf8MhIA1QhZ/GnHc90c7WubqkmXTGHa7S4Q8XP JkBz4KurguMvSj4XqxtI8xLjj+fa/wpcaLifOjVzPxtEy72zIpg/njYEXNzDO0QZRWpL K6FiZGw9OtwRvcxGd0NvZBDaFNYCDrvqUFGDAHaJ1YOSAvbvAaxNN3Cz1qNriXco8BFr 1nygiEt+Yb7Rscx/HX+FdBDFutR5lgsiDNdTvDIm3W8t2Hwc9kdamoqPjAKJXgsgpR1x bkgTDIDxUjAPCLURrXsnbiDahfgoVB8Dee9s3hXE/+JFSiXXll2Zq4DSaVv5h5+l8X1U 35jw== X-Gm-Message-State: AOAM530DV9q01NP9iHZdjVJ09zjXjvxhE+ov6EqQHJSWMC/E3tuSpqVf C3UaKlAE+yuQo0Z2ji5nNGwupQ== X-Received: by 2002:adf:ed11:: with SMTP id a17mr16771878wro.197.1605119753978; Wed, 11 Nov 2020 10:35:53 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:53 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 04/19] drm/radeon/radeon_atombios: Move 'radeon_add_atom_encoder()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:30 +0000 Message-Id: <20201111183545.1756994-5-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/atombios_encoders.c:2721:1: warning: no previous prototype for ‘radeon_add_atom_encoder’ [-Wmissing-prototypes] 2721 | radeon_add_atom_encoder(struct drm_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_atombios.c | 4 ---- drivers/gpu/drm/radeon/radeon_atombios.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index cc80651b25773..be96d9b64e43b 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -37,10 +37,6 @@ #include "radeon_atombios.h" #include "radeon_legacy_encoders.h" -extern void -radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, - uint32_t supported_device, u16 caps); - union atom_supported_devices { struct _ATOM_SUPPORTED_DEVICES_INFO info; struct _ATOM_SUPPORTED_DEVICES_INFO_2 info_2; diff --git a/drivers/gpu/drm/radeon/radeon_atombios.h b/drivers/gpu/drm/radeon/radeon_atombios.h index b7c76920feb7d..a895a7002c3d3 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.h +++ b/drivers/gpu/drm/radeon/radeon_atombios.h @@ -28,10 +28,14 @@ #ifndef __RADEON_ATOMBIOS_H__ #define __RADEON_ATOMBIOS_H__ +struct drm_device; struct drm_display_mode; struct radeon_device; bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, struct drm_display_mode *mode); +void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, + uint32_t supported_device, u16 caps); + #endif /* __RADEON_ATOMBIOS_H__ */ From patchwork Wed Nov 11 18:35: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: 324132 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622956ils; Wed, 11 Nov 2020 10:36:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyshlQcCeEQFNEihAN2TsMKemhdXiKpgm3fAO4uWPI5hTLqJPqf+Jpufh/uH93JqultKAAV X-Received: by 2002:a17:902:b604:b029:d5:d9d6:1938 with SMTP id b4-20020a170902b604b02900d5d9d61938mr22109800pls.52.1605119768488; Wed, 11 Nov 2020 10:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119768; cv=none; d=google.com; s=arc-20160816; b=ANqqBkcj6JJSfeUgcczfLDwptojdkDPAh0Ig8S4jCpDR5gk2Y6pfhbu+SH3c0iNjiS 71Lv2cnoAqop/qKEpKhvvpPH0Ii8oYsGd9CD3rGvDpy/QdDFQq7UKE+JsPb4es9QC+SU IKpkfnoX87FfCurgcj9QXL8pfG+jauGCTnmRs7FO1JEyBSrzGLVeorpUZW+mr41w/5ds ftwFrDWtN4ZEkEbPOMmfSHV5iL42WFpYmaS/VV/A2M3G2l6ZaeL0CASKAVXuNnv/2iS4 R4ZtC7eGAxgg1mtlOveFqN3JkU3nceQNZgQNqy1MTygB4UaFl+dgoozH9NWrpSgdR4AY XZSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=cRogsfPjvEl9nAEn61xyDYmXUv55fxL+OK9O51v1gDU=; b=i0heNHLO+sAoOQHs0hILAUsPhWXRenAIDXIv+jX30b6JEWlL3PnPkGCo8ln3j948cE l7HO4NOVTl0QGqeLkkSnmo93jTirzYssjBFBISGNFVdaRraZR6L8+LixJejzrfeqL+0d K1uEt+YTmGukAmRU5DCUvOywl9rwnivHqt2tO64Bz/hG54qMnYKMS/EBA58YPkduMb9N 0gjy+w74HYI2aY+swgL7+wCSr/gIqVY3rli46ANvr5fW3T/kkXPU+iaayeX6b2wXuG0L i+DNkhVLhnZkLNbK84/l1UuQM9F0vP+c+QnrsGGP+ur06d2iZng2oPOaYquAl2yZjp9O lIQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NwSfZcUB; 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 h10si2374992pgj.101.2020.11.11.10.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:08 -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=NwSfZcUB; 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 D96756E0AF; Wed, 11 Nov 2020 18:36:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 28BAE6E0D2 for ; Wed, 11 Nov 2020 18:35:58 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id w24so3281648wmi.0 for ; Wed, 11 Nov 2020 10:35:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3URZpu7tsjM6Y8F+U84uwe7BiqZoOF3VMCws5wVhmBo=; b=NwSfZcUBkZP1B3bjdQpFGUbvYxY2on6Vnsld+oALrNLXef2TBlHsg9YkXO7WHGcLx9 bGcznb7awz7rQ7aaQR5UX0KF45TaerbkAayc+4dVR5LhAMdv1ILTvGbbBLPii3oga4rz 532wAYa4d9W06NIt3THXNul+qgEaZOA8jGQ9XNKjwRsjUWof8uq3GZ8p/h3MwP3TebSR RlnyfgsYbd3/wDW9TWSGaEjL4q2ACna09McJCVHevo90DxkZh3hqnNbVh2ed2ClFb8hi rhtJ8kFUsggqFT8wgGvXYnGhEklNgHV5ahw7FUzJndF+c/JKaMIGqKwfEAU55BsxMUxe 1Iww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3URZpu7tsjM6Y8F+U84uwe7BiqZoOF3VMCws5wVhmBo=; b=Vy3C15ZXWfZvDFtY0AcvIiVY5VHTElbo1DRuKeMZlXQVLrcb4wloggGhMah4oPD4nC rRKaY5cU4UWOEmHjAbLNRld5fde7SFpuFVLNUGdaQ9X+rCSUQqGWAFPvKgweMQIXaPbv XAgMcbYlwCUw6A5TBlmToFIa8Hk7+Iab+67/Eum1BXbGlfVCmih3UZc2Pn0dsMJA3h+P rf+HwKoYCw0K2hgjWDXPQOXdRg1QgVK0knCcP71GoiBWinKL5nyCj97N10LTgmotfDPK cRNEfmYswkaD2KC7RmKxH/f81FJYHcglb9K9ICbXS9UDw4ifyQI6NQ1TueMCPeGu39vs ROYQ== X-Gm-Message-State: AOAM530pgMk+V0Zza47qpJqAeYLYRdWef+soZ9Z+jcMZD4hUJkNA7Zyx WCVhlePZDMaS7j5I/NLiFUmfzQ== X-Received: by 2002:a1c:1f05:: with SMTP id f5mr5424835wmf.98.1605119756738; Wed, 11 Nov 2020 10:35:56 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:56 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 05/19] drm/radeon/radeon_encoders: Move 'radeon_atom_backlight_init's prototype to shared header Date: Wed, 11 Nov 2020 18:35:31 +0000 Message-Id: <20201111183545.1756994-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/atombios_encoders.c:186:6: warning: no previous prototype for ‘radeon_atom_backlight_init’ [-Wmissing-prototypes] 186 | void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/radeon_atombios.h | 4 ++++ drivers/gpu/drm/radeon/radeon_encoders.c | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.h b/drivers/gpu/drm/radeon/radeon_atombios.h index a895a7002c3d3..fd03755e6fa2c 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.h +++ b/drivers/gpu/drm/radeon/radeon_atombios.h @@ -28,14 +28,18 @@ #ifndef __RADEON_ATOMBIOS_H__ #define __RADEON_ATOMBIOS_H__ +struct drm_connector; struct drm_device; struct drm_display_mode; struct radeon_device; +struct radeon_encoder; bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, struct drm_display_mode *mode); void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device, u16 caps); +void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, + struct drm_connector *drm_connector); #endif /* __RADEON_ATOMBIOS_H__ */ diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index b60a373d3ead3..46549d5179ee9 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -31,14 +31,10 @@ #include #include "radeon.h" +#include "radeon_atombios.h" #include "radeon_legacy_encoders.h" #include "atom.h" -extern void -radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, - struct drm_connector *drm_connector); - - static uint32_t radeon_encoder_clones(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; From patchwork Wed Nov 11 18:35: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: 324130 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622923ils; Wed, 11 Nov 2020 10:36:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnidyjO25pBOqGPn+AU8uFVBqKVxslcPkUzdr0SOuoooGw+q+XpaMiSyxUXr1pc/S8+ZqM X-Received: by 2002:a17:902:bb8c:b029:d2:2503:e458 with SMTP id m12-20020a170902bb8cb02900d22503e458mr22449371pls.18.1605119765265; Wed, 11 Nov 2020 10:36:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119765; cv=none; d=google.com; s=arc-20160816; b=dIqKYIHy0awpSKag5iLyNiFYPl9GG7qKAA5S5dy2Yv/RdpbE26g7xTkmQuOWkG2vSA iXhlyiwwFtim71hlc1Ri+M4EbTi9C80QrvFO9xSq+5l4Pt1qJN56Ep1fVC4Gk7Hw3jNR NMsNlbcpIZUl1evxGu4VjZOzbUFdHUwDbt6IuzPvRrtIW12uYH+si4OEDfMC60h3bVUA qLNNgvjBIluc85axhUpFcj7bzRXA/3Sj5vwOarX0GAR9wMUSJ0vhc9Gx7qHQk/uhnI/d lDomvj3eZlqlblmd/Tqhl01Il1accjSuHBOBT+mTIjqFadLMYdfAzgV0N63EpTIZBc1p fPaQ== 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=mIeWLNh2IX5ysZD4sqvO/6pVIch8k6wLe37soAx/Fdk=; b=hnob6hJ44kGW1PAHackW0sy7SPPooWvM18a/jbYGGJoMcgcV6K7ysPD9+u28DjOdpd rmq2Q7+FtSVyNXpyaL9uuMGjfcjG7ePWRsY+1qdZpOu78Yfsh3h+cky31vJMNCPkFRsk 8N8wsASaZElwxwjw0sdmyVpueRTKRKAqOoXDImXE+U0tfUuO+JAf8bj5Ze9X9cfwFFtL T+ypZYq1WnHbH4oX1vljJqSM/4Rv+ttlOZ0nLCqe/xWdtgQM2TCjJTLy3Pap0OQAEm+v Bx7RDvJqrwgNyCfvwL06+v1VFUQQz2+8uL1gw+FaoUuEF/iE7Eiv2XBun8VKLBoYlv54 itIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=lmJGhgGz; 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 c8si2560641pjv.172.2020.11.11.10.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:05 -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=lmJGhgGz; 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 E42EF6E0B7; Wed, 11 Nov 2020 18:36:02 +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 AA31A6E0B7 for ; Wed, 11 Nov 2020 18:35:59 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id c17so3464531wrc.11 for ; Wed, 11 Nov 2020 10:35:59 -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=e5cdr3xq36okPI4QzX5zrw2cP/RfIKuDYtKma5kBVEI=; b=lmJGhgGzkUlMORHmRw0waBQnbWjKPoD+noPk/XBK4aL+OSKBkstdqDh4ByHmbSo2ar 60EdFYIXNiwFZcEg+M+bBI6h8SPfZwfp5cq/oKW/QyJpd1H6hhyVpUmWXEyuKB4w8fOL NhnB6u+8hDqSoTzKfRyXWmbL2jZ0vUDmDXgkUVsK95jmI6I9WDj/6+ebn4LGDrcpq7jE NvQxmIzA/j9gtNRSfiSHk0pg3J1HKpppJB/mLj2mYZngu1IKoP5kkOxoFx/dtMPGVOJ0 COWd4EM3HSU+y2K2q4qOZkVUKW+XXuMrGVyFYFvW1WfOWpZN09IcPnmOaFi0c1l+2Av0 etSA== 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=e5cdr3xq36okPI4QzX5zrw2cP/RfIKuDYtKma5kBVEI=; b=lVFsLEopfF8dHspVEMCT8PAvVCEYwwp1wLMkgAyD2kmC74KKHtcyyPOfvMiGetG9Fb 3SsPfI54hLAXXtX0PvkD+wAGzuLs2PqnIN57haRlO+BsxFo+jdm/PWq8SbcfsEqaNb5W HE5XZdVRHAmrMTKuv3ShFcilwN7/OdYD/B/ZPvD7APiWDoHIExEZGy7uLwq+96B1bzh8 qR/TMUcb2oxshBr0bqmmkIwIKk/MqFghWRmKIP5i9iD6W9YHOVLnPHRgFGOLlMD8riOt jdJJbBFIoGhA9GuLqKVoSpGwz8ZNKgTWl6njzJZGp4QXadZCqAOVUDxdkogC/HPPxUit DJZg== X-Gm-Message-State: AOAM530hnVHHB/bzVnsg2fZ8fzVyiE6p4D+3ApWDKHFrkfUoRA8y0sLV adlqRsZCPHXjushmTSFi3IrYFuj10EwZopx4 X-Received: by 2002:a5d:4802:: with SMTP id l2mr18034885wrq.424.1605119758267; Wed, 11 Nov 2020 10:35:58 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:57 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 06/19] drm/radeon/ci_dpm: Move 'ci_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:32 +0000 Message-Id: <20201111183545.1756994-7-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik.c:1868:5: warning: no previous prototype for ‘ci_mc_load_microcode’ [-Wmissing-prototypes] 1868 | int ci_mc_load_microcode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:5847:6: warning: no previous prototype for ‘cik_enter_rlc_safe_mode’ [-Wmissing-prototypes] 5847 | void cik_enter_rlc_safe_mode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:5868:6: warning: no previous prototype for ‘cik_exit_rlc_safe_mode’ [-Wmissing-prototypes] 5868 | void cik_exit_rlc_safe_mode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6286:6: warning: no previous prototype for ‘cik_update_cg’ [-Wmissing-prototypes] 6286 | void cik_update_cg(struct radeon_device *rdev, | ^~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/ci_dpm.c | 7 +------ drivers/gpu/drm/radeon/cik.c | 1 + drivers/gpu/drm/radeon/cik.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/radeon/cik.h diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 8324aca5fd006..a9fc0a552736c 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -27,6 +27,7 @@ #include "atom.h" #include "ci_dpm.h" +#include "cik.h" #include "cikd.h" #include "r600_dpm.h" #include "radeon.h" @@ -157,12 +158,6 @@ extern u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); extern void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, u32 max_voltage_steps, struct atom_voltage_table *voltage_table); -extern void cik_enter_rlc_safe_mode(struct radeon_device *rdev); -extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev); -extern int ci_mc_load_microcode(struct radeon_device *rdev); -extern void cik_update_cg(struct radeon_device *rdev, - u32 block, bool enable); - static int ci_get_std_voltage_value_sidd(struct radeon_device *rdev, struct atom_voltage_table_entry *voltage_table, u16 *std_voltage_hi_sidd, u16 *std_voltage_lo_sidd); diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 377c3f0c9d316..af08d6f1be53e 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -32,6 +32,7 @@ #include "atom.h" #include "evergreen.h" #include "cik_blit_shaders.h" +#include "cik.h" #include "cikd.h" #include "clearstate_ci.h" #include "r600.h" diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h new file mode 100644 index 0000000000000..297b3c1ff804f --- /dev/null +++ b/drivers/gpu/drm/radeon/cik.h @@ -0,0 +1,33 @@ +/* cik.h -- Private header for radeon driver -*- linux-c -*- + * Copyright 2012 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __CIK_H__ +#define __CIK_H__ + +struct radeon_device; + +void cik_enter_rlc_safe_mode(struct radeon_device *rdev); +void cik_exit_rlc_safe_mode(struct radeon_device *rdev); +int ci_mc_load_microcode(struct radeon_device *rdev); +void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); + +#endif /* __CIK_H__ */ From patchwork Wed Nov 11 18:35: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: 324131 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622933ils; Wed, 11 Nov 2020 10:36:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwle6ZGDUvSsjIumjGhfhjXaiV6WExSdWsoVKVnlyVwJLzImBfGt/xnv7M7oB6IG3mBQkpp X-Received: by 2002:a63:1849:: with SMTP id 9mr22903236pgy.443.1605119766916; Wed, 11 Nov 2020 10:36:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119766; cv=none; d=google.com; s=arc-20160816; b=pw1C9Qc5j3drBBXsb3SsMGlP06zuMJ1NdFD6OXHCKGT7EPFXWfbte/7BTvH5U0s/lE b1IDpAiEOMDG2Kjm1qpWSGZq4ckfrXislvegevhKI8PwRIRPWtQdSn0tBGw3je4FpCfN lIOZCfB8do4U3yqaCd9aZa2aBRMWeMh3NR6LKYEYyaqVrcHP550SuIrzZpQxHMj0rkJR Znt2mKJak463F7zeW9da0htFBPEDE+ApQRvLpiyVtblXT0WyAuRYrNieR2lAkKsibxei Jh7vG6q6qqPiZH+mfw46hmhDhgocaI2u1eW9Ty4ZZ0E7RrSPdmb9CMpS/d44PknAaMtj wA1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=CW3N7dO4cIwmBneAW+Eyd9/DO5QArtlCBhRp+yTa6u8=; b=u3pl3BJljipBoWUBFyk7LPrFqGuCyQ3CduGnq8476WLUU5NNGXwQmV3KplkqlaZK1W fyrL91KaKnDaoVgycRHrj3aGScXhDK3Bw2x40GnX62d39TCBTGYjvYPx0picN8UftfLI /qLHN5N9wIbOQPMem6YVN3f+7IWCZnlBE+ER1JC9yosQ7FK9cE8SQUV/auCBlBuV02t9 3aoGTI+ARvVL5LWX4f8RRDWyaZryqQfay57FZqteFMBAEZDN068r1mukavdnjWfjVYuf tJBE1wQ6bm/8b+XpvCQcCVh9FDc/9Y+srZeEFsCJwz3zcXBFuWxZxCl9YOzn2jaMgGJv CUbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jeGdCa0N; 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 y7si2527976pja.113.2020.11.11.10.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jeGdCa0N; 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 1B1526E0B8; Wed, 11 Nov 2020 18:36:03 +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 EF9C76E0AA for ; Wed, 11 Nov 2020 18:36:00 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id p1so3479055wrf.12 for ; Wed, 11 Nov 2020 10:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F+vpUFKiF0HcP1zSRTFbAOX8pFoOA6PVK8Wzkj+zQXI=; b=jeGdCa0NoNUq3v4IBNq+kFqCX0O6wzIHiSzPq+rxIAFPzZ0c3KttYWZ8Hm79XPkGsR TOFT+rRsoYoNK23zhRzpQym2B27iatWLIVg78YGh8V8E6iOGuGvzj2wVfpFcsWEwT8n7 HOhB3HXwoFsyYEv5nVILuX3r4vRAXkWfe4fiWJrX1RoFr+QdimVEVSOn25GzCXScyT6S V5P1JIzy6Gn5WS7kdxE3JqwhIqMsb4tL8gFIi5gEgvpY5v5dicbDdGGcnXSaJWChoCVn CHv4e3eMR0jlBUD1/ziqDXiXM2JE4yxki+c+ns6thWLWjdHzL0/n9l983FHIGIAAvbh9 5wlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F+vpUFKiF0HcP1zSRTFbAOX8pFoOA6PVK8Wzkj+zQXI=; b=Bq8Y67obKTz98TyqK3gXOlc6lwpkHC0Ge61UEBzO++FITK3NdoDaL9+nk7JTgJ6/3d PDNqHh25yKQ3i2hvyMUuwrmgc0OZ7MbCJkbFQV771eeznLbOy7AHjYy8CqnqLkDgbkFS x7Rj+y4sauYtWKWIhQYEkidq9ErgJCwkPX7yz3BxNY1zFx4tp8KBNL/SSnvRZOoxLsyy tq0j6/Tns+Q2H5zmCFSwKrC9IyKy4d8tMe0K6hoQ1gruD2Joy+Qx7chOmw01AGml10Yi U7rDKt3Xt23LQFFZRhw35Wh4op2nnSoVJu3ujz6eydty2Y1WeWrRaABjQBaMLjLB3zTs vDqg== X-Gm-Message-State: AOAM530wNSBCwxuHy94eFPgUJyWVf5Wiqn6ScLMUazBU3UKVjTwh1p6Y 9nemz7mDKvkw9TQA3Dd2O9oSeg== X-Received: by 2002:adf:fd0d:: with SMTP id e13mr29324843wrr.85.1605119759656; Wed, 11 Nov 2020 10:35:59 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:59 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 07/19] drm/radeon/si_dpm: Move 'si_mc_load_microcode()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:33 +0000 Message-Id: <20201111183545.1756994-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:1570:5: warning: no previous prototype for ‘si_mc_load_microcode’ [-Wmissing-prototypes] Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/si.h | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/si_dpm.c | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/radeon/si.h diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index d0407145c07b5..88731b79c8f57 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -39,6 +39,7 @@ #include "radeon_audio.h" #include "radeon_ucode.h" #include "si_blit_shaders.h" +#include "si.h" #include "sid.h" diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h new file mode 100644 index 0000000000000..0a5018ef166e2 --- /dev/null +++ b/drivers/gpu/drm/radeon/si.h @@ -0,0 +1,31 @@ +/* si.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2011 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __SI_H__ +#define __SI_H__ + +struct radeon_device; + +int si_mc_load_microcode(struct radeon_device *rdev); + +#endif /* __SI_H__ */ diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index c68ab2fb1ac23..32b697965c064 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -32,6 +32,7 @@ #include "radeon_asic.h" #include "ni_dpm.h" #include "si_dpm.h" +#include "si.h" #include "sid.h" #define MC_CG_ARB_FREQ_F0 0x0a @@ -1721,7 +1722,6 @@ static const struct si_powertune_data powertune_data_hainan = struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); -extern int si_mc_load_microcode(struct radeon_device *rdev); extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static int si_populate_voltage_value(struct radeon_device *rdev, From patchwork Wed Nov 11 18:35: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: 324133 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622986ils; Wed, 11 Nov 2020 10:36:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsegbhuct5OFsQkV9scQMYvPNOyJA5bKaGlkN1uJeJfaHacwHZ4DPP1zQVATTNrISOp+/C X-Received: by 2002:a63:5f17:: with SMTP id t23mr23379409pgb.190.1605119770373; Wed, 11 Nov 2020 10:36:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119770; cv=none; d=google.com; s=arc-20160816; b=tWU3so4eUK66Um78AWYhj1TH1HVJ4Ffy+NQabITw9o0vBAtzNofWjnhkqXL60VvEYC JBRmgIkpjAL4R2AzY6YBb3IG9ZhdrXRJVaCbxIRFdD+4n0ZDst/1rYZuBE+duKwdpjrt ipvlEl9VcCQP0fQ3v89Y5bv2v1Xsh+Rw8+Mbu2JRdTmbEvTPQ5AUV0weBruXMbtXBphj pTUAHVtT7qUvqkuBqp0w2Hyl9U4wjsofQtdhH8r+0nuU+84ZFrjsqAZvdFPuIysEcskB TqokkTI99ueL8MmeYmx7kOg9+WvNBvUsg6Gikveq6uO0K4YGUMlxzEfqKmXDSu0G6FcM 0g9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=/vG4QIOIHXu8r0wjf6NdbTXJ+rxIJerAhRoXgWeh2/A=; b=Q7viqhepJAnT7YKvrHyizv7bhwFXhzPQHe3EXkkYOhLPKno4iOLCa+mIKf3dS7I6CG gyyV5z8Zv87KcA3xK95O+6EWIQ8yPqrlb1qcazlzoVNovgMMIE2+a6RGMvn/RcXyVHlw kdj/OQNG9/PEW6bmdfybjq6vGtzJCcS/hTuVzfujY1oKhG7jxUlRS/+HQXec/c6JxUIJ In5Is2/OwdXtE+2DEs2rQ/NfZdWLLQBPiHwIgCSefGYUWL5wK3utXFXxgPnJ2P8BBzsL ggdFF8qOrhT56gHJWgPAFl0wJRxGlf+y4xLyZiEkbJSXi3v3urvEENrFNK6Jt8bZ71ks CBWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=r6woMpmm; 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 g19si2463649pgj.454.2020.11.11.10.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=r6woMpmm; 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 1278C6E0BA; Wed, 11 Nov 2020 18:36:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4EBDD6E0B8 for ; Wed, 11 Nov 2020 18:36:02 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id b8so3528942wrn.0 for ; Wed, 11 Nov 2020 10:36:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c/TaDkB9aPGP5jIvVTMt5uJ/KkWKg3o08L440ECaIrc=; b=r6woMpmmXo0Dj5775fZ4Cgbnwo1FcLxbbKcVGettNgkwJ6Cx4wfgTiVzUOZ6yjHa91 PDuEfCvVpOvcRcswiUXZE4gg4YiSkaO4G+MOIhIJDFTP4KBjBvqLiq0DNNqICzoiFW7K vnX1v4/opW7uZuRGmvaWYOCdLTTwraEi8lxRBR8Po9duljYvHQJF46gFiGEtDBUWJwGv DrHkoqTr2dLCZEXQhmRMLTOTSwId9FnX25/MW4mzBrabNNErqk3pzrqo+Xd6pXZyl6sE 2ULcoFWvBt9kwgAkdUKPix1fyjnL3O+cZaEVUSV5Zl0EWldvROjwGOxITtQgijDW3MkZ s3bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c/TaDkB9aPGP5jIvVTMt5uJ/KkWKg3o08L440ECaIrc=; b=uQUmrzQwIdj3QHrkoVSadSKCsgN0KDRRWbcZWjU8GAVf09Ch4YvOolQDgyRVnC5pM5 /t0ZiaUuR+u9VfQYqiKt63K9okQAuJ2flPATIhoHln1g/y70mitL6nTRpDyI7QvanBgA jf41tUeuBnP/rEDeEnc19d0W3odzG1cVxF098++64rdBxsOBgNrabm8vho+u6b7Gahrg sdzCY4GqVeOc+gg6b7Ti91mtkTeG/y3NUJn1xEPRB93iAGmJv6HrO/Etx0K8IfQrW+tZ MMxTfglmA4g+NhGpVZeYpF7RciUsRkVm0HeT/NaZAA3Z6oj4sJl/qp4bE2craxXsdezd B3Ww== X-Gm-Message-State: AOAM532zKOrKLHi8qaQf9zNUnDP7iKCFuvn36m0WOw8H6q3YOysZJ70/ XHgwlPUukDpPkemIsPA8qcRrBw== X-Received: by 2002:adf:e44f:: with SMTP id t15mr28375034wrm.380.1605119761005; Wed, 11 Nov 2020 10:36:01 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:00 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 08/19] drm/radeon/si_dma: Move 'si_gpu_check_soft_reset()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:34 +0000 Message-Id: <20201111183545.1756994-9-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:3768:5: warning: no previous prototype for ‘si_gpu_check_soft_reset’ [-Wmissing-prototypes] 3768 | u32 si_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/si.h | 1 + drivers/gpu/drm/radeon/si_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index 0a5018ef166e2..a1751ae560f02 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -27,5 +27,6 @@ struct radeon_device; int si_mc_load_microcode(struct radeon_device *rdev); +u32 si_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __SI_H__ */ diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c index d2fa302a5be9f..645897d1bfc31 100644 --- a/drivers/gpu/drm/radeon/si_dma.c +++ b/drivers/gpu/drm/radeon/si_dma.c @@ -25,10 +25,9 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "si.h" #include "sid.h" -u32 si_gpu_check_soft_reset(struct radeon_device *rdev); - /** * si_dma_is_lockup - Check if the DMA engine is locked up * From patchwork Wed Nov 11 18:35:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324134 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623004ils; Wed, 11 Nov 2020 10:36:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJya5wxeSuy3iIRKXsDkMC61e6veqYsdO//zEeL51wPeDNU3WXWDM/++l4o9Z2j6/gB6WNDo X-Received: by 2002:a17:902:ba8b:b029:d7:e6da:cd21 with SMTP id k11-20020a170902ba8bb02900d7e6dacd21mr13193078pls.38.1605119772117; Wed, 11 Nov 2020 10:36:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119772; cv=none; d=google.com; s=arc-20160816; b=KDfb4nfnGk7vJK9ytpnRA8ujNK6WjC0JvI7kd5mrGze2RybtM6XQUZQgfC+0OeZvcN fXEYUyRyFp62WAUl8mC6VRvFG3Mvz8AZKGlpC2R6ce5/p5jYqEv1z0tQ+tx+3EYrbKKj /XJ9nZRCQ1DjAnoVzeqvRviFj9nfZeNizcZyv210EcSj0QefDziwZLurViogQahogOOH Uxu13Z0IKhngCQNkBF8Bz9wJenhLxEUlPKP+yg6pEhiA6Vjbgv+IJdgsFA+gd8W4BW8M 3Vg8AkLO4Ar7ScmpSiaZjyhwwgwRmqdX7f87lWat6X/I8V5GZRcIAJobJI8rX7JsUY4F YwNw== 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=OuIzlOVqeXOyhG4aMR/6XvXcDY+FOgtmmVtOYuxRxOk=; b=PFt7CJ2HK/IWuSVX6irT0Znu5gkehfQ6+bjIkaYkbHqwqtMLt3mSVRIlhZSfIiJXpm hTEFqdXm24MrM4pZRt1UokKH2VgKdA4rmxaRA6+dTQze12rpKhedn7I548KkL8AeqRAS f9+dFWafNDjWzwSFc21jPa9duq1gzsT0rwClYzSkX1TYKRcSAk/49bdXrHw2ySdnEaC6 P1NguBFqFzkxYfXaSGjyr1Hp5QeYCsOaHb0n3RpB4xDNc11uumXFBxg41a6V8/4yeDWV m6KSVlR6fIRtc4MX88H7KJMcU3hzOkGuGWC/bMURMJ0L5QswJZfb09DtVPLmQ/rKuDUt bufg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Z3euSqif; 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 n10si2514926pgt.542.2020.11.11.10.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:12 -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=Z3euSqif; 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 3BB256E0C2; Wed, 11 Nov 2020 18:36:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id A5AEC6E0BA for ; Wed, 11 Nov 2020 18:36:03 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id c16so3255863wmd.2 for ; Wed, 11 Nov 2020 10:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qh+SB3F0wBSwPJdxJvDqep6O/eLLWzPpPvay6C9QqmM=; b=Z3euSqifNwhu6ebXW5Gn4HJE9Yrd49M2yyiJejyPG3OBZSHtj/wbH/SAXvd9F/iwBQ 8FDI9vSOlm7tmv2uIeobzdDRXa9KBXZnAGQQ8LCyZsMtyagmQRTmyRw6G1pyBIJfj4sT LZ5qoVGnqhXDxbs0M9QvOx6n4nolTJmxEXKS9nFIJ3MbERYVarJ1SrfEnjbYy08ct8v+ hNdwbpEouUdQK5qYj5eOLFjoupuVUuETdzgN8bKKbT0Pxw1LCqh7g3+BTFeoov1iiTWO IsdNw7GqJvo3N1osqhhyB3/R6T1BA8EdglHEtkCt1UNLq15nd6wAASH4X8ieuXoVFVZ8 rwUw== 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=Qh+SB3F0wBSwPJdxJvDqep6O/eLLWzPpPvay6C9QqmM=; b=LV1OJTtU3JSKFpMWp5s2qSCchla33RHbMLVCCTSiF/Vrk0de+k7K8c1fDy+DuuhPQ4 xHf/17lBEUHQLsbk+DnmKri39Rh8nMmwezJMUEb1khx7lBV7LXzSEfYRxr570A5lZAq/ v8z+AWWVVFW4ME8QrxgT/da/6sEcONsZk/VQn4wQJFhqvZEY+e6R498vTRl+IXdYMm/x uSZQjD/6Vlf5A9qqEb03qNjUPXy8Cz1CrwBr1xVau3Vb9WDwjdOCmsJ9zfwtxoK3jeK9 RRqRGS+ORKl0+z6SN1DtBBVuWIllpfRDHwQWk+TuafypTN7+qIi1TaAEG6rWNtKFvPiZ ua2Q== X-Gm-Message-State: AOAM531kmn9bvAc2BnnX1ADtQhUMxlJnIgYJI1blp65gSkxIDAmViFVG z5kh8kr4YQdKYoiuVAlddyGvBA== X-Received: by 2002:a7b:c453:: with SMTP id l19mr5463021wmi.2.1605119762301; Wed, 11 Nov 2020 10:36:02 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:01 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 09/19] drm/radeon/cik: Move 'si_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:35 +0000 Message-Id: <20201111183545.1756994-10-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:4186:6: warning: no previous prototype for ‘si_vram_gtt_location’ [-Wmissing-prototypes] 4186 | void si_vram_gtt_location(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5186:6: warning: no previous prototype for ‘si_init_uvd_internal_cg’ [-Wmissing-prototypes] 5186 | void si_init_uvd_internal_cg(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5801:6: warning: no previous prototype for ‘si_rlc_reset’ [-Wmissing-prototypes] 5801 | void si_rlc_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/si.h | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index af08d6f1be53e..0330ee86a372b 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -40,6 +40,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) @@ -127,9 +128,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); -extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); -extern void si_rlc_reset(struct radeon_device *rdev); -extern void si_init_uvd_internal_cg(struct radeon_device *rdev); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); extern int cik_sdma_resume(struct radeon_device *rdev); extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index a1751ae560f02..f483a64d17050 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -25,8 +25,12 @@ #define __SI_H__ struct radeon_device; +struct radeon_mc; int si_mc_load_microcode(struct radeon_device *rdev); u32 si_gpu_check_soft_reset(struct radeon_device *rdev); +void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); +void si_rlc_reset(struct radeon_device *rdev); +void si_init_uvd_internal_cg(struct radeon_device *rdev); #endif /* __SI_H__ */ From patchwork Wed Nov 11 18:35:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324137 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623068ils; Wed, 11 Nov 2020 10:36:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkS5r76pxQNJZhjkIrUXEuiU4YQo9TN93A/1mwy9pk75QvczBu5FMl7oYrGRnm5bUqA/HE X-Received: by 2002:a17:902:74c7:b029:d7:e593:fcb with SMTP id f7-20020a17090274c7b02900d7e5930fcbmr13879708plt.71.1605119777498; Wed, 11 Nov 2020 10:36:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119777; cv=none; d=google.com; s=arc-20160816; b=yW4s83shemfFrFLHiQlaHHWAW6+5rWzxDbLYx3578kdqy4te5t3KHNCCeQsANaBDMt WWB9Gmn8h3Fvb12wiFRtZUvnRSqj72CIkWDgP3arOeGleBHr80W6SlD0zOEObY/DhDNR 9lvpr/rcbadKmGM8xXIRohikgTqrnzyC/gotsBArfnClE8FS31NsZI07Zx68Y+9lPPpk OlW1BumiXWqZ71krGKrFS94n2gzn71WVsfzAvP9A/Vbez5AXlrnsHHisL4ESZTqpw3zn OIfQCsAEgzadURgfKnCrDpYXXOp/GtQkRhxImjp2p7Vnp0hcYtuuap+D28XF+NYkl3Nj yiNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=F5fslplSyKWklhTSeMS3mx7UbOsJnD1yCRg+7LEIcAA=; b=gXDNfLPmyBN36FmHp2xwci2qnILPKGh34zvCQJEa0mcyBzxFwVsfL+ISzNLJhJJTfv pZTktNIMF5AvSpU6Je/g/YHwgm0hMtWVQLDOJby0hgHUxyH2X8Hz75GwzhrF9R35IqLM xF5ju0oNBCrsY2vMQEy8B01SC1rbQ4fcmqUs/NOTIgZK4At6adFvbjDgJ/0x+X24Uqjk 91r3uqcldlX9UjSKxOfZG2zVt67QcCRHE3N4WT1Zwoj6kJyYME9Vuk7lh4k2iLwjzIQU TDNArtYoNLwG+couo9Q2ezg3nM24yJD8WAKs35UBhYH12Aa9JTpbJMucbuw2YWJFMtH+ YcvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NJd73JO8; 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 d7si2259744pgq.421.2020.11.11.10.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36: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=NJd73JO8; 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 DB64A6E0C6; Wed, 11 Nov 2020 18:36:13 +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 055FF6E0C2 for ; Wed, 11 Nov 2020 18:36:05 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id p8so3511368wrx.5 for ; Wed, 11 Nov 2020 10:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wQLiBxHM+lzm9ozhMmLXV+2+mYaIBz41oWImWz9w9hM=; b=NJd73JO8AhCRjn0Dimt7Zx7LwVzjPfPvz0Q7de5mm4lbH4VN3T9g5lqmYSLnuOF9tu b28psdPSe3h3rvZaBt6PTzgVQlcTjC6+q9zysQzBn/Izo1sivArJskR3h6+W5zQqrLa0 LFAPYjhnNOTSf2/p6AQo5OVfp0ojT9L2+od3s3nAMfOSZsGqOfw9gmWL7zEnvuWwWI4a zqh5I2d5C5qjcMsxvkOLggAj3Rh1DmaXOu7qWzqL3YnsRGfm6+foHZpFoeOd0lXZkJKu dC2Ymmsle3SOm4Qp4Gqmx549kx5S+59K92JhnUPnMXR3Udq1Qy1LtxUVQOk6+1d4O5FK w+cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wQLiBxHM+lzm9ozhMmLXV+2+mYaIBz41oWImWz9w9hM=; b=D88NIdWLwMuwT/bGTJZsD+hSgEOfYH1HJcwf8YSCaWJHw6m7Aq4aARwHr7QgaOTq8S CscHmI6j4s2Zu/J633gOdH5wAovZ7ES4Uw6uO5lviqtHJGgn5y+izP5BmiT/Pb/nHXbk QU6nLWVWAhAswGwtJvL68IWn6wdhb/F3fn64WLFScW2B9k+4M2OcPWQkeSvYWeR+Uf3U NvsbmoYz8+NDI16liuJerxKpAf4T54m1CbYCXb++EF0tu1A1kR7bkEO7q4xRGBpj+Daf kRXCa/OJwnPoSC7Nt6pDj9XZxrjFxufeS8zkNk5PweBPnMzNH7ti68tw+1pWMjtaj1nq m0sg== X-Gm-Message-State: AOAM533TXGIztMMmXhXrp6L5ZC8rHH7kDJxacDpNOEqO6EXi9q6vvtd5 SfDy+4fe5c66OzxWuSdLSU2nXjFuteUHlcJz X-Received: by 2002:a5d:654a:: with SMTP id z10mr9037894wrv.285.1605119763560; Wed, 11 Nov 2020 10:36:03 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:02 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 10/19] drm/radeon/btc_dpm: Move 'evergreen_get_pi's prototype to shared header Date: Wed, 11 Nov 2020 18:35:36 +0000 Message-Id: <20201111183545.1756994-11-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/rv770_dpm.c:62:30: warning: no previous prototype for ‘evergreen_get_pi’ [-Wmissing-prototypes] 62 | struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/btc_dpm.c | 3 +-- drivers/gpu/drm/radeon/cypress_dpm.c | 3 +-- drivers/gpu/drm/radeon/evergreen.h | 2 ++ drivers/gpu/drm/radeon/ni_dpm.c | 3 +-- drivers/gpu/drm/radeon/rv770_dpm.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index 018949668536e..4e64ed38c439f 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -29,6 +29,7 @@ #include "btc_dpm.h" #include "btcd.h" #include "cypress_dpm.h" +#include "evergreen.h" #include "r600_dpm.h" #include "rv770.h" #include "radeon.h" @@ -49,8 +50,6 @@ #ifndef BTC_MGCG_SEQUENCE #define BTC_MGCG_SEQUENCE 300 -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern int ni_mc_load_microcode(struct radeon_device *rdev); //********* BARTS **************// diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 6d3690bcca2d2..fdddbbaecbb74 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -26,6 +26,7 @@ #include "atom.h" #include "cypress_dpm.h" +#include "evergreen.h" #include "evergreend.h" #include "r600_dpm.h" #include "rv770.h" @@ -44,8 +45,6 @@ #define MC_CG_SEQ_YCLK_SUSPEND 0x04 #define MC_CG_SEQ_YCLK_RESUME 0x0a -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev, bool enable) { diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index f8d772e612a48..a829deb8b078a 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -29,6 +29,7 @@ #define __RADEON_EVERGREEN_H__ struct evergreen_mc_save; +struct evergreen_power_info; struct radeon_device; bool evergreen_is_display_hung(struct radeon_device *rdev); @@ -49,5 +50,6 @@ u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); int evergreen_rlc_resume(struct radeon_device *rdev); +struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index d39bbd9793cc2..dd5ef64937230 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -26,6 +26,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "ni_dpm.h" #include "nid.h" #include "r600_dpm.h" @@ -720,8 +721,6 @@ static const u32 cayman_sysls_enable[] = }; #define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32)) -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern int ni_mc_load_microcode(struct radeon_device *rdev); struct ni_power_info *ni_get_pi(struct radeon_device *rdev) diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index badd8ac6e038f..ef2f1a048cfed 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -30,6 +30,7 @@ #include "rv770_dpm.h" #include "cypress_dpm.h" #include "atom.h" +#include "evergreen.h" #include #define MC_CG_ARB_FREQ_F0 0x0a diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 32b697965c064..b4581392fbce9 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -26,6 +26,7 @@ #include #include "atom.h" +#include "evergreen.h" #include "r600_dpm.h" #include "rv770.h" #include "radeon.h" @@ -1720,8 +1721,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static int si_populate_voltage_value(struct radeon_device *rdev, From patchwork Wed Nov 11 18:35:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324140 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623129ils; Wed, 11 Nov 2020 10:36:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNY+I5IArAAhzjglmsYwn1Iar1JJtDnhs1zGjARHCtnbIPenueMEP9zyNTxlGPTzFMRjVr X-Received: by 2002:a17:902:d706:b029:d6:c71c:2599 with SMTP id w6-20020a170902d706b02900d6c71c2599mr23641798ply.46.1605119781824; Wed, 11 Nov 2020 10:36:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119781; cv=none; d=google.com; s=arc-20160816; b=qUT19eHq25LE1yvXylx3kbx+9qoj5CGU3acvT5APMYhvYlHFRN5mpNv6rNCN910Krp zLy+lCnwXdYCzDdLjeEpD+NBLZ+8v577IHmqp4VyJurGRfJ9etbXID6rCFXjL/Mshr1S nSTC9Jir9m3GHYC9sxIrPo94gT8sSgeuwIBuRnD6sU00S+oMGKH8DN72cJyiXkJ86zEr Lky+7iaKx5EsYHaib3wgJd6VjjeW+g2nMq/KQT1eO4DPxnJOa942grxVIgHxwUQzMIYH SNUapr13Kaus/6ILAO8bwRIusSmPn3N273W/riNDjImz1Hd0dXNKIRJ6kUoGxbQg8euF 0d2g== 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=utyctAdZ/UmDrbATP0mZF0kSW1T3/LahIBjjqGxX+p4=; b=tAa3MklHgH8A4Gp1vaK5R+i4zN2nqrtBNbKnQXe7lBUkg8K+414/F83WmLcGqp9wjf MfFQF3blxPbjzpkShOWzyHUqUQQVn+wby3oZVYEV0PgOERnhCdgMvXClhl4naJ7jWic6 YF/Rt9stRH792jhQagTAsiM3dveZYwjQY9roRrSXkgFdjJMLg237fKyNTKZZP0uVIwVY EnsvS1ChLg4GyzfIOipo5pYFSTw0yrm7zEDhNVzz+oRAVcM68UYANJn4+a6dniHu5n4W CToBfcUXj2i7EEowsG3Qe3Kfk8jRqo1HSaQC7uE6N+HIiP7Y5G5CkCF8F+J0hcbx7tO/ 1R1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HTWXyLmb; 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 z19si2505591plb.22.2020.11.11.10.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:21 -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=HTWXyLmb; 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 9C22B6E0D0; Wed, 11 Nov 2020 18:36: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 4BD066E0C5 for ; Wed, 11 Nov 2020 18:36:06 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id d142so3158773wmd.4 for ; Wed, 11 Nov 2020 10:36:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q+2/74QrDEEKKJXkOkI83hXV4pIp2Mbn56f+kjUKQmw=; b=HTWXyLmbRrgE4PKmA7/WG+a0iz/P94gk0iGkTjccCVy/t4igMz5c/KjOl+W5iEMFpm oRnVq2a1lcPn6JVUBWZMkgw7mezOKW7eJLebqzp1adFNR0kxGH91hiUt4ypUwmEgBaTM ewBI8uIgWOfYdhJfI26BSk2Hz/sV07h/LmcHrbP6rrVFmQgiv+upd4Orqn6erjuAaWSf wSPjOxmulTrlHxBpZFWhHZ/OhKtPo5OufF/JDnMnbS4e27uI47M4BEM7ycczUnfUUJMo /iAj8eiP0FA2g01MkY+agP870L7Vg9iqCI1zBqkEcTlAFHDc4GgoHfo64C67N80MCVRi zf3Q== 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=q+2/74QrDEEKKJXkOkI83hXV4pIp2Mbn56f+kjUKQmw=; b=aOPqCOi1KUsg4hYf3IR0lOwnXv4RZgE2RqiOXoZ/EoOVKf+UuVXhrpJAumcu/CjzAF RDmynKYLo2IkaYfC3jxB6VnxRhkImeLPM3b3CSw1HcLUN2nlq/IJE9qEOSwm1c/bN1gi muXJPR+O9PaWz3RdDXv6d8bpr/RWPxKv2UZHD1TNdqzkxc30eD7xk5KNn0q+FmL+zioE HYSpRBMuP+aD0OpS0j9wBR4Lix25OhWeiSwsaBMQxrT0NoFr+Pvp13WTeGDsyQ9hBZmy P2IEqiUfFUAiy1ZUxFiZdkVOAv5koOTc2X7+uQO04QqmRIiA0EFo5r0Pd7GWZnBCtqaI pCjw== X-Gm-Message-State: AOAM531nzOyMV7/67kBbZ1OGr5PZYHSvyVb7kSk0gUM+t9MTgbiKcc+i ks2hjT4KRLdsICwURnqh9I88aYfCahYYlQBS X-Received: by 2002:a1c:6654:: with SMTP id a81mr5827678wmc.104.1605119764891; Wed, 11 Nov 2020 10:36:04 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:04 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 11/19] drm/radeon/radeon_audio: Move 'dce6_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:37 +0000 Message-Id: <20201111183545.1756994-12-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Slava Grigorev , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/dce6_afmt.c:32:5: warning: no previous prototype for ‘dce6_endpoint_rreg’ [-Wmissing-prototypes] 32 | u32 dce6_endpoint_rreg(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:46:6: warning: no previous prototype for ‘dce6_endpoint_wreg’ [-Wmissing-prototypes] 46 | void dce6_endpoint_wreg(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:110:6: warning: no previous prototype for ‘dce6_afmt_select_pin’ [-Wmissing-prototypes] 110 | void dce6_afmt_select_pin(struct drm_encoder *encoder) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:123:6: warning: no previous prototype for ‘dce6_afmt_write_latency_fields’ [-Wmissing-prototypes] 123 | void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:152:6: warning: no previous prototype for ‘dce6_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes] 152 | void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:177:6: warning: no previous prototype for ‘dce6_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes] 177 | void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:202:6: warning: no previous prototype for ‘dce6_afmt_write_sad_regs’ [-Wmissing-prototypes] 202 | void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:268:6: warning: no previous prototype for ‘dce6_hdmi_audio_set_dto’ [-Wmissing-prototypes] 268 | void dce6_hdmi_audio_set_dto(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/dce6_afmt.c:287:6: warning: no previous prototype for ‘dce6_dp_audio_set_dto’ [-Wmissing-prototypes] 287 | void dce6_dp_audio_set_dto(struct radeo_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Slava Grigorev Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/dce6_afmt.c | 1 + drivers/gpu/drm/radeon/dce6_afmt.h | 52 +++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_audio.c | 17 +-------- 3 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 drivers/gpu/drm/radeon/dce6_afmt.h diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index eec5d7a627388..4a1d5447eac17 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -22,6 +22,7 @@ */ #include +#include "dce6_afmt.h" #include "radeon.h" #include "radeon_audio.h" #include "sid.h" diff --git a/drivers/gpu/drm/radeon/dce6_afmt.h b/drivers/gpu/drm/radeon/dce6_afmt.h new file mode 100644 index 0000000000000..176a538664a27 --- /dev/null +++ b/drivers/gpu/drm/radeon/dce6_afmt.h @@ -0,0 +1,52 @@ +/* dce6_afmt.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2013 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __DCE6_AFMT_H__ +#define __DCE6_AFMT_H__ + +struct cea_sad; +struct drm_connector; +struct drm_display_mode; +struct drm_encoder; +struct radeon_crtc; +struct radeon_device; + +u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); +void dce6_endpoint_wreg(struct radeon_device *rdev, u32 offset, u32 reg, u32 v); +void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, + struct cea_sad *sads, int sad_count); +void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, + u8 *sadb, int sad_count); +void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, + u8 *sadb, int sad_count); +void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, + struct drm_connector *connector, + struct drm_display_mode *mode); +void dce6_afmt_select_pin(struct drm_encoder *encoder); +void dce6_hdmi_audio_set_dto(struct radeon_device *rdev, + struct radeon_crtc *crtc, unsigned int clock); +void dce6_dp_audio_set_dto(struct radeon_device *rdev, + struct radeon_crtc *crtc, unsigned int clock); + +#endif /* __DCE6_AFMT_H__ */ diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 9d9a5b3251de3..7c5e80d03fc90 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -25,6 +25,7 @@ #include #include +#include "dce6_afmt.h" #include "evergreen_hdmi.h" #include "radeon.h" #include "atom.h" @@ -33,24 +34,8 @@ void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, u8 enable_mask); -u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); -void dce6_endpoint_wreg(struct radeon_device *rdev, - u32 offset, u32 reg, u32 v); -void dce6_afmt_write_sad_regs(struct drm_encoder *encoder, - struct cea_sad *sads, int sad_count); -void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, - u8 *sadb, int sad_count); -void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, - u8 *sadb, int sad_count); -void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, - struct drm_connector *connector, struct drm_display_mode *mode); struct r600_audio_pin* r600_audio_get_pin(struct radeon_device *rdev); struct r600_audio_pin* dce6_audio_get_pin(struct radeon_device *rdev); -void dce6_afmt_select_pin(struct drm_encoder *encoder); -void dce6_hdmi_audio_set_dto(struct radeon_device *rdev, - struct radeon_crtc *crtc, unsigned int clock); -void dce6_dp_audio_set_dto(struct radeon_device *rdev, - struct radeon_crtc *crtc, unsigned int clock); static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode); static void radeon_audio_dp_mode_set(struct drm_encoder *encoder, From patchwork Wed Nov 11 18:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324135 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623021ils; Wed, 11 Nov 2020 10:36:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkF9ZYoWNfmLl4zbzdCNUYRsbf9/yM5f1XUxjCpWmT6e2GvSZ9v75S1VsBITf/De+RwUCf X-Received: by 2002:a63:6645:: with SMTP id a66mr23780802pgc.207.1605119773674; Wed, 11 Nov 2020 10:36:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119773; cv=none; d=google.com; s=arc-20160816; b=VMyyWmzh1TnMlGGIQx4gVqT3ObyYfkjGx5gbcB2bwfjLSDj/1IlJFo/2vL7elcJErn 6PTc9TasayctRq3ZSEXAT2NVjMN5Ld//7xuDizgJqlrDu/uDMqsmjYx9WpAW4ZKiGO2W 0bloMhvw+02VWjylI0iNogEF6Y/CKZVWiGY8R9tvYwVmAq4slU28/qiOXYNYAmtZCuWM gEczVPkrnG6ZfiSUkjQJ8xJoW18iTyRfF6LK0t0vV6nUcxa8qfC4kkZ19tHADw3xpGqa HHTLWXvVeQTSbCwdjadyey8hBltg+N0tG8O7Ayr99LAkwpLaezSIgqTytJWIpJJO0Xv+ HTkA== 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=s7GAwteW1thZvd9NfB4jaUo/wuce5AbcgE8R8jxbg0w=; b=vQoZYNQ85XngvxylWWYsADfRDSoCJ1PGjRzkJNqmIkPbJLthNOu4HEfwmaUZ2KJ9MD j+KD6yr8iOvQ2Lj8YcZhLA7eDZsQvbiTJ1+4auH5xqtm+vUmBK5JcOSG0jxPTBsZcTRG rAPm+/UN8mW/NI70LWw6mwam6JXfXf94GYAxoyk29limifk7dRqfbKR9tbRRdc3Xb4LM mQHLV7ZoVh2A0G6hrDQSWAGgsThQ0oLYgokQAqYf0GaluFxiDTcDdAL4mWxiLjxx346K JoDI32dWWUm9ksLxMuTSIsHXFw7hiVS4ZcWa6VcBO8JILBxZ5WkgmrxgoRxjz6YINm+k KU4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ASHzCi9B; 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 d17si2637301pgg.250.2020.11.11.10.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:13 -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=ASHzCi9B; 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 531CD6E0CA; Wed, 11 Nov 2020 18:36:09 +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 979E36E0BA for ; Wed, 11 Nov 2020 18:36:07 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id l1so3491952wrb.9 for ; Wed, 11 Nov 2020 10:36:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k31TtB+plPHQj7iD5gVHpYef9lXJ4rGnOi0xYl4wuaA=; b=ASHzCi9BO6TBGcwRlccGp9W06y8j0wVJwMq49gkz7BHMXS3KXpXkm539aLEiIiT5eV 3J60SRWROZJ0FT+DPZIgUGeuLIlBzbJ3JgOp3RVGEh3UCM0qSMagRKSiVQlwBRX4N89t vB0Ree3UHKnBben9i1q5CR6vQJvd5aYZC1Vbwd6mmNVPgH8nDExSxRuJVBh14GdCW7Yq 0GuSXBlbu27+niVCWH4gNpovPCq/hwYLR9m9chbHVsUkz/4Wbwssr2FrsBf08bVFdWsM NDCSx0uK9ZHg22H6DCkX1XPyX5gUn8DwZt3ayQdLgTk51um7Nb4u1XDE8gltx6Udm44E 0e2Q== 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=k31TtB+plPHQj7iD5gVHpYef9lXJ4rGnOi0xYl4wuaA=; b=i+mX81cJAJdpFwXkbNhOl1QvX/hjwreJJAI0RY/VMMmewotuUBhQDGdfXAzq2e6zbJ MK98c5hKi9bJvNuSUGbZyt6JLMRPtxt9CiLmzbOpw8zOhk1yWUJmRllf4vDjMB3ARIWv 61AbpxEE219J9RlKPWlAmBqFj24KIKNaesmzsIb4VVaHsBI4l16a0wih/PDf74qKtO/R rtmbbro3fyG4iVFxJZxq17fAZKu4psPoEp07jUy5ayN8I7TmXqU55FPUijAjnucK4d0m YchfEsnikc+lFQOQTiKymEipRLCNmMnRNz1kz19OYSz843kmWKUN9mwvCDa6DqG/AVyQ BAhQ== X-Gm-Message-State: AOAM5305wVvomb/6pXlmQYd1XKro5yZjYZ+C5cVNkIiNyWeigIBMS8Ij oDnLE+wZhlGLhyDAHbRbgjguDw== X-Received: by 2002:a5d:66c3:: with SMTP id k3mr26422272wrw.123.1605119766309; Wed, 11 Nov 2020 10:36:06 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:05 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 12/19] drm/radeon/evergreen: Move 'si_get_csb_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:38 +0000 Message-Id: <20201111183545.1756994-13-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:5678:5: warning: no previous prototype for ‘si_get_csb_size’ [-Wmissing-prototypes] 5678 | u32 si_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5710:6: warning: no previous prototype for ‘si_get_csb_buffer’ [-Wmissing-prototypes] 5710 | void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) | ^~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/evergreen.c | 3 +-- drivers/gpu/drm/radeon/si.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 28830f4ef95e3..d8ee80ad4ea44 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -41,6 +41,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define DC_HPDx_CONTROL(x) (DC_HPD1_CONTROL + (x * 0xc)) #define DC_HPDx_INT_CONTROL(x) (DC_HPD1_INT_CONTROL + (x * 0xc)) @@ -218,8 +219,6 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); void cik_init_cp_pg_table(struct radeon_device *rdev); -extern u32 si_get_csb_size(struct radeon_device *rdev); -extern void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); extern u32 cik_get_csb_size(struct radeon_device *rdev); extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index f483a64d17050..310c58376f927 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -32,5 +32,7 @@ u32 si_gpu_check_soft_reset(struct radeon_device *rdev); void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); void si_rlc_reset(struct radeon_device *rdev); void si_init_uvd_internal_cg(struct radeon_device *rdev); +u32 si_get_csb_size(struct radeon_device *rdev); +void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __SI_H__ */ From patchwork Wed Nov 11 18:35:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324136 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623041ils; Wed, 11 Nov 2020 10:36:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxV00D6VGzPI5NENkKTtPUnjT54D0//9Kn5Gchum8fmzNAzFpEGKHORSUyfHOzaG5qqvgiN X-Received: by 2002:a17:90a:e615:: with SMTP id j21mr5179771pjy.74.1605119775655; Wed, 11 Nov 2020 10:36:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119775; cv=none; d=google.com; s=arc-20160816; b=Sve312AjY1znank9/IXU3wKN88nrPppaOBK06JbfSl0VNUetUestVlDFe76fgY6UyR l7i18PAzJ11yN97omaivQblGfoYRfBNQsekAL7juUMT4XZFD4NVORgBRIbt5Lft4K9ZO Wo7PYGGQm2LY8zxIGHUMlcbzTLRKyhONukHSXGDg6gksWc7Dh1Cm1YYVovgBQHAtF3Sq UJK8VQH6SCCs3PKlilWnj6/XcGTut0aGqycWrzQGkSCGC04fu8o2JSHUkV9ymhA+LaZK xdQM7laxTYSTn1xS0a4Z1gwEPWl17YeilspHk4LapurIFM8p97UdsOttGygktr25+xB0 Mrlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=5YZ7lZtvZphXfu2D0EKK2wNTbEkZ9hIHwSMQwLVbuGI=; b=FRiw0NNmhi6ds5hsaxhnPWKGqlNFtCDJCa8NJnGx2GGCVkc5WOnNb9ozD3qPi3aA7K KKDgsoQNafpessaljXlDjq9W4OWoLIChsnADkHySs21eCccf29bQlMxJhlvtlJ+olN7S I7RvHuxw/1ETZG5B3yxZHtrVy6iuBR53TeUzDxkFTP+NQ5hAZTDVUy6WB2O1W0to4pUj /cfkFDA+FWEW0FSCnKWnczFIBqGNC6dfOJC6cyWZ4jc9NpJsxjaPoD9MR39pAXFSHu42 FbNPRMb21AuTNmhDhM2Z8uk86AJN3KiSMdlEIAA1PYYyX0835Ly3Nh0MZtm3NLSfX0O6 BnIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=otqPagV4; 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 o207si2945672pfd.67.2020.11.11.10.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36: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=otqPagV4; 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 A7A3C6E0C5; Wed, 11 Nov 2020 18:36:13 +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 0034F6E0C5 for ; Wed, 11 Nov 2020 18:36:08 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id c17so3464931wrc.11 for ; Wed, 11 Nov 2020 10:36:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=noNY+SglbM8aEsCCdAF8dY+Y+lbfpcrhUN1CWHwGoPw=; b=otqPagV4SXXd1S4bOoNcEs67FQlaLvEbku6qmOoK8aE1zjdLYKVfZt2v7JkFaWtoGt doYNKSwpGKD6zLqXc1RSr97zszWJFrqrtVFwB+HAQ7qkJvhfIaU9qI9XjbLIi2Op/aL9 TrIP0kutM2A86a1F2u6S3zDK33RL70wJY9BMgSuSjYlf0dBV8/pwJA18QUXQJvUpAGEb 1ZKO9CR685LbV9yHiwaEocPif42d5g7zo9lzvVZs5Ni7nLvTPgjAT8U2kUchMUnD98Ka qf4zusM43Z6CxOQbTVYWg15XQw4u+Kj1yRWp+rOBegM5YgeBcvj02UUQMWNw2YA2bwLV P10w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=noNY+SglbM8aEsCCdAF8dY+Y+lbfpcrhUN1CWHwGoPw=; b=bUOHKLNuNM7gpYqxz/01GyyxJPcnUQ54LP2UluwgrhSnmgsLz/YHUyNkWS9j2NRcE0 2/hKE9D2SzgyZdpI/QV81hGsKJnSy6s0BTr9dCfLqBYPupSovkoyUTD68BgwPjAbCRNN YEoWouj5odE0QWYh0wKvVZWYFS9q0KBfz4g7hZSZYs4V1XFNeSoFw+tzs0oNEm/rkh3U QTMOlaQvZuEHAb+xhH6yoRVZqt7EXIuBLME+ViCNFsA+qFmaJo3DgcatmdcVy6lAiPF3 mBLvI7uzrldAqLroFBILHcBFnEqmdQY+7Kl6ofElmMVJOTjDUMj7iqRXVeqMN3t3GRTM hfGA== X-Gm-Message-State: AOAM5332bs3KdiqsJM17wchxUMy5j5CilgJh3th8+hgVwT5xjZ1sw1Pg f2h5GHorzjvGOTUlH3Hh2j5ePw== X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr32946201wrx.164.1605119767603; Wed, 11 Nov 2020 10:36:07 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:06 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 13/19] drm/radeon/cik_sdma: Move 'amdgpu_cik_gpu_check_soft_reset()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:39 +0000 Message-Id: <20201111183545.1756994-14-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik.c:4845:5: warning: no previous prototype for ‘cik_gpu_check_soft_reset’ [-Wmissing-prototypes] 4845 | u32 cik_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.h | 1 + drivers/gpu/drm/radeon/cik_sdma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 297b3c1ff804f..6630b9da9e7aa 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -29,5 +29,6 @@ void cik_enter_rlc_safe_mode(struct radeon_device *rdev); void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); +u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 3c709ebe8d1ab..919b14845c3c7 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -27,14 +27,13 @@ #include "radeon_ucode.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "cik.h" #include "cikd.h" /* sdma */ #define CIK_SDMA_UCODE_SIZE 1050 #define CIK_SDMA_UCODE_VERSION 64 -u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); - /* * sDMA - System DMA * Starting with CIK, the GPU has new asynchronous From patchwork Wed Nov 11 18:35:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324138 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623095ils; Wed, 11 Nov 2020 10:36:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKw+9oeHjyQVbCZwO9QRr3HcuxClRKXRmC9bW66a/uOjwckX6xEOh/UhBNC6jVtQBTmsvr X-Received: by 2002:a62:8cc1:0:b029:18b:32bf:8e29 with SMTP id m184-20020a628cc10000b029018b32bf8e29mr25143754pfd.42.1605119779074; Wed, 11 Nov 2020 10:36:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119779; cv=none; d=google.com; s=arc-20160816; b=x2DDiEkWuf3dfqMrQXV5XAdQ+rbOEyEBppCArVkNuJIBr4Fb0gMUMz14KkjA6HMNfj 2wlo2RcDTCyCriLSEapkLd7z9ZqJ9d7YOeVxxd8fzYyhaNh3Pz1jQ/re46nyZE5avvGa VMiQ0jaseDce5g0mjbe7a0/gHgES2gSAyrvC3y02/VIwXupNb0N+vwyXixnR2RLN7ZPK GQJBVapgSLs5RrAhH+jVnnPadEaoe7PFsjW5NKD8iFhvMzbm1d0RvzuGfF8WdZo5nRqh hUpwo362R4GquVrNyI4DI7WRb/0FpTJzepd4a8bXsGNwHHsWfBuOBvc11+l4jFKkfTbp c7xg== 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=JI7TKyOzeoh2eIJPt36/OVbuRdrl9pZvQ3Ry0HyFJS8=; b=H8boNKe8IlWY4N8fLY1yflF8WqMe/3TNJb6MaJMsYIAJWhl9+aSzh2Mm9rHrwu+OTy zKPTpEaK7WT8gFmNXsPfZyfLqQCDu4Ldy4c2H2f6KGSb4LII95D/Q0N3qEdHvMRNHlLn oGhhn+SLbx63UUkStPsSeUoP+c7ifPlan4yH0zuwUd9WOaz0qlg4MxLBWFv1iwjXeaSq Jmu5//OSRclxTJgdDOvDXlfugLaJP/1wxA92ZWJGbM4ae2TY58GJo0eyMKKRU/Wiamvs sDYjojQYJM2WNfrh0104MRArA9gMCnR8dPYfh//abBYnvBfQ91QDTuyUNqUqf2G/tefj 6wRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P1O53+g6; 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 l5si2495405pjq.107.2020.11.11.10.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:19 -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=P1O53+g6; 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 5336A6E0BC; Wed, 11 Nov 2020 18:36:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 624326E0C8 for ; Wed, 11 Nov 2020 18:36:10 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id a3so3235256wmb.5 for ; Wed, 11 Nov 2020 10:36:10 -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=jXZJEO8V1+GfDNFYh0xMC5OCmgkAkp7ogIzPc700bj4=; b=P1O53+g6xCjn0HVbg+2LcTzi/TxNj9Kba5GMdJ54vcSns9ORtCgzS6wEcq8rV+SHzZ OQ1b7VoYUb67TSeIhw45K8NzFZYOxVXUj/3/XAwpmpXZzZgun6sh53tHnV0m3MwhEVi7 a8XsVZN+PctNbvLAE3nukCVgBfi8sC7HP+uDeqJM7QJ3DRUQjaLK1IZ3wj+wtoOryBfm zscGpu1poXcuw9zuyJATHdJTAr6LIveeSn7QUjgghiHeKeHImZqEkMvSpim4SIsglgT1 IY1JEaNFiwaMbrDH/ed1/K+ood3SkdVDbDrUnDY//QjQCZfqIshJSbIBdDUxXdDV8xCu zr6g== 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=jXZJEO8V1+GfDNFYh0xMC5OCmgkAkp7ogIzPc700bj4=; b=lMnHnMNkiOcws9xOw3xFRNVBbwJYqFILyY5/1aBloj5qKGhIum1bTazOtP6NKQHqZ4 4Up/whqCKQh56OugNCaiGblSvmd0iThUUIaGwlutikQorqYPTkcwbecniSt+O3OMvqCx UbwUcWYkPnZaYAktZz3qPiVMiWGILlMarYjHP454xSKKx+2S++/b58Sy2AWny9j0uoaO D+JnkDtay7KVmV6ydlr5LmY5rwRpjIFuUyNKgE3HcTcFnPy+/EWdm+eJISDlqHOFKlht boXUYjEeID63tIzzuxbhZP5SeqK++iK0iVmcDWCMdpaxHZbqKuxAuvTUUvwH3uyXVuXq vwTQ== X-Gm-Message-State: AOAM532tEEeOC469Cpk1qHi5/pY9sIkyRhXoTWB6jR/nlv/SELrARPp/ BH2vQz2gPoi0tuvdfJYKhPzjGw== X-Received: by 2002:a1c:ac03:: with SMTP id v3mr4489776wme.9.1605119768967; Wed, 11 Nov 2020 10:36:08 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:08 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 14/19] drm/radeon/evergreen: Move 'cik_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:40 +0000 Message-Id: <20201111183545.1756994-15-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik.c:6413:6: warning: no previous prototype for ‘cik_init_cp_pg_table’ [-Wmissing-prototypes] 6413 | void cik_init_cp_pg_table(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6670:5: warning: no previous prototype for ‘cik_get_csb_size’ [-Wmissing-prototypes] 6670 | u32 cik_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6702:6: warning: no previous prototype for ‘cik_get_csb_buffer’ [-Wmissing-prototypes] 6702 | void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) | ^~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.h | 3 +++ drivers/gpu/drm/radeon/evergreen.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 6630b9da9e7aa..420207d19de52 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -30,5 +30,8 @@ void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); +void cik_init_cp_pg_table(struct radeon_device *rdev); +u32 cik_get_csb_size(struct radeon_device *rdev); +void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index d8ee80ad4ea44..f95b588354274 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -31,6 +31,7 @@ #include "atom.h" #include "avivod.h" +#include "cik.h" #include "ni.h" #include "rv770.h" #include "evergreen.h" @@ -217,10 +218,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); -void cik_init_cp_pg_table(struct radeon_device *rdev); - -extern u32 cik_get_csb_size(struct radeon_device *rdev); -extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); static const u32 evergreen_golden_registers[] = { From patchwork Wed Nov 11 18:35:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324139 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623116ils; Wed, 11 Nov 2020 10:36:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJygAyDez3DjA3Fj6+mdmJupjKiyYtZ+ossfiNwzltdrolvf2Y3ztM0MG/SFjLnL715i+HyN X-Received: by 2002:a17:902:868e:b029:d7:eb0d:79e8 with SMTP id g14-20020a170902868eb02900d7eb0d79e8mr11722523plo.12.1605119780423; Wed, 11 Nov 2020 10:36:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119780; cv=none; d=google.com; s=arc-20160816; b=yo2mIh2j04Wk2xmNih/Smk4UoySfKQUO47CxjmbgMASvfZYh+L7QFfRj9V0jqMxzvs FjCOc4PiJ8MuKc48rra02zlFQ7UN6MLalji0bENK8tbBTdL4J7GmBjjsF7BOkLS0DODX sI8cYfuLs/ZyCtClasnFgCFphXpyE828IJU5KVhfdwR6mRs+pv35t7lUvT0vFFoP+Bxd 93GBOGg2+Is42y2lD49hEuOKQ7iAZtu9E4FXZ1MMnbkZLTeAG/Za4wDvUGFJjB0Xejcg oPARDtsFN81Yq/+3/y8y8Id81ndDDjrlJBF4TnDoJ4wToBcg5zCwKXp7zCDQhnW8NkAa H5tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=FlGyPK/omy08C+vopOIyne38wzKtrtfUFZQ3b0fA9FQ=; b=YBs+AACilcP2mQd2Rz3KCgj56wU8fFFo4g7NQr2E9R0b0Vjmc4qh787lPIaNrbllS2 FNqdQhuSs2wLWncYmyQhSxaM+XzK1Ogmcd7KtGIGr3TWJdikMF69/CEwK+hV/+SRaQMV diwdANG4rzIy5MIu3szK0i1gjT1TUPt+i2N4VHdSWqMjHxN5St2BUMAzX9yKEcJU4dk1 oU0Ie6IsfvQARe96qPEEpnkWUst0j2tuXwg4KksPemUUOps/RFRz1PjNea39zlqKZ/Bu NrUUrbxba1+Q5h2nOjXk/a/QCpXfHLu+kSB6ZC3zC8ZIv7GatBEvgyyP810UmD6SUelE BlOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="ZppS/pPT"; 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 s23si2279126pgv.106.2020.11.11.10.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="ZppS/pPT"; 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 D39756E0C4; Wed, 11 Nov 2020 18:36:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9ACCD6E0C5 for ; Wed, 11 Nov 2020 18:36:11 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id s13so3242008wmh.4 for ; Wed, 11 Nov 2020 10:36: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=wcR9SHA/hLxAo0DjnBJYKl1ZjLgHXt+Q6E2OPcU6TRk=; b=ZppS/pPTRTgdttLh54xP750Kj6wz+Skcp0gIoIgehdUbqo2zKnEjGa/yiqC1zsRVT1 RojNDkdIIOVwEH/cxzrfw4IzVBy+MNQX717cjqzVcQD/DhZ7iqciX6SM6vWljUD9C7vy INmw17RivPboOAMS7Evvldk4WAubEVgS4S/nkTyULsmgnbzDLjGxfJfy+SxvxwbIOBkd Z8BJJPyj9Xo5ParXgCKw1BIgyM1MPmCqIDQXge0PR3SNWPVIVb1bugXxBYfp9WDf+xld Hhidwk+ywKJksPFcW9w+HUDn2U5kjpbYCXXweJoLxXkIhKaCfiQqoIVuzgh6iYP2RRo0 amRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wcR9SHA/hLxAo0DjnBJYKl1ZjLgHXt+Q6E2OPcU6TRk=; b=VjT9fFFLYHANnmSefs7exBD6zgM8HckUR+P4Y0PNQGY8U5XCYgb42P0A0p1yBDRGgR puMCo/jaY0zUyp1ZGP0XRkq5w4xgDFlXgY7qOF3v5NXLK2cejcXDevQzGd5jjtkEPN+d DYIKBJdSgrLAvGxUv2kdXDa45Ygi1mqasiwgqUqjf7kjqKrn7HcdPNmFhH7XdTBMrlLN qCh5sYM68/2yFfP30s2U+8+sI/hWWFvSpp1YDGthJBwgnUU44rGrk1TejAz+z2wnqWsJ 8fmvl3SuJlqFLTGaEalfpBT4iHY+UFUNfgJXWJjxXtY9sGEM9XS4mYN65uikkYbI/9e9 Mi5g== X-Gm-Message-State: AOAM530G3I66AVYHWfkDX29/hNxyPZYYs05Pj9uTZtgEm1VWo+TayKXm LwcmLLOvMwUzo1ZAOInGzFli/CrZFHksUrGa X-Received: by 2002:a1c:b0c4:: with SMTP id z187mr2725638wme.113.1605119770340; Wed, 11 Nov 2020 10:36:10 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:09 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 15/19] drm/radeon/ci_dpm: Move 'si_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:41 +0000 Message-Id: <20201111183545.1756994-16-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si_dpm.c:3802:4: warning: no previous prototype for ‘si_get_ddr3_mclk_frequency_ratio’ [-Wmissing-prototypes] 3802 | u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si_dpm.c:3815:4: warning: no previous prototype for ‘si_get_mclk_frequency_ratio’ [-Wmissing-prototypes] 3815 | u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si_dpm.c:3897:6: warning: no previous prototype for ‘si_trim_voltage_table_to_fit_state_table’ [-Wmissing-prototypes] 3897 | void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/ci_dpm.c | 6 +----- drivers/gpu/drm/radeon/si_dpm.h | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index a9fc0a552736c..0dfb0ed9af89d 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -33,6 +33,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_ucode.h" +#include "si_dpm.h" #define MC_CG_ARB_FREQ_F0 0x0a #define MC_CG_ARB_FREQ_F1 0x0b @@ -153,11 +154,6 @@ static const struct ci_pt_config_reg didt_config_ci[] = extern u8 rv770_get_memory_module_index(struct radeon_device *rdev); extern int ni_copy_and_switch_arb_sets(struct radeon_device *rdev, u32 arb_freq_src, u32 arb_freq_dest); -extern u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock); -extern u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); -extern void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, - u32 max_voltage_steps, - struct atom_voltage_table *voltage_table); static int ci_get_std_voltage_value_sidd(struct radeon_device *rdev, struct atom_voltage_table_entry *voltage_table, u16 *std_voltage_hi_sidd, u16 *std_voltage_lo_sidd); diff --git a/drivers/gpu/drm/radeon/si_dpm.h b/drivers/gpu/drm/radeon/si_dpm.h index 1032a68be792b..aa857906ef93d 100644 --- a/drivers/gpu/drm/radeon/si_dpm.h +++ b/drivers/gpu/drm/radeon/si_dpm.h @@ -234,5 +234,10 @@ struct si_power_info { #define SISLANDS_CGULVPARAMETER_DFLT 0x00040035 #define SISLANDS_CGULVCONTROL_DFLT 0x1f007550 +u8 si_get_ddr3_mclk_frequency_ratio(u32 memory_clock); +u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); +void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, + u32 max_voltage_steps, + struct atom_voltage_table *voltage_table); #endif From patchwork Wed Nov 11 18:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324141 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623153ils; Wed, 11 Nov 2020 10:36:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJsyWai4uQsPA98WazxCD5Kota2hIxwVuKYFOYyFYW3wpGk4yrg5zUGYA9hMo2Ct+QqTWm X-Received: by 2002:a63:461b:: with SMTP id t27mr6471960pga.122.1605119783240; Wed, 11 Nov 2020 10:36:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119783; cv=none; d=google.com; s=arc-20160816; b=eh9xAwRiQw4oaTTgcclroLWTOVwBnjIihZxoyNnyvfF5VnjlYIiGYF7yLiY3E6VG7y tNPx7wXvbU4Di9/kFYRpFx+zxKZdGcG/SKZMMgAo7e83NRuRz11SFZ4cOohCH2FO/M8X dLEceIRCKlJJeifbI7Qwo7cuByFDgF0Sb6aH26hxZFz/6qpOc5NoP9gcoy8HHuGO6omF bFezBWEU0fs278DuNHJPvdovt0zfXbD1K0I5JuXaPt/68b+LbHY3vrkjfIeRyqc5ey+C 7L0Cvn1CEWm7Obn2DxGyakgOlxabsVVenNGCIW/R0+WwI3JWN+TRJeVUqkWOUfY5nZ/s ltlg== 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=pMord8ERFhqGkZ+OkbgQ54414A56VrJQD4k2srydzPs=; b=DJ8gqdg+oP33OZM5H6RBDQ/8vfX+gfn9rc3qe+XsGEDu2rk5IfcTQkYJktaIB4L/g/ TCHEVibkh0JIV9lNQl1Ct4wHOM06nwccIIOTyS5Bo+ForifyOojqTfabwF2Fa0EGH5iM ZfyHVJJuJi/GTpoWyYXS/dZ37MdeknsNZSDZkm6YpgQjpTxwgsEpw8T5ttdpOwL2PUrz cRDPMc+SsvPD2R6GY8ZUJzHOfBrPDC4NcEvSJx8ujLFM6xqQVD3+tpMzgAlYowbgQa52 NEpjQg2Z1TJG/OroBUi305kJhMK9t7nRIqoQfWSSgUVKb6+/VzXpvuESs4qUO6yXEFrX m8jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=w++rpOsz; 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 g23si2453892pji.81.2020.11.11.10.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=w++rpOsz; 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 7A5256E0CC; Wed, 11 Nov 2020 18:36:14 +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 1275A6E0C6 for ; Wed, 11 Nov 2020 18:36:13 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id 10so3175090wml.2 for ; Wed, 11 Nov 2020 10:36:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=spCm618rU4+U7z1bfdflo8X7NldT43iivpTuZ8WssFA=; b=w++rpOszkxweKlNZMXoxmKyy4U42RAzQDXbaasLv0JL6Mz+/P2AanrfR3DqMvCG6c1 6NYHQlNcK1yEneyt/TJesz+g5TEv6/JyNC/pI3IvwLglHc9XS5o1OSu4jFsJARQenUoq hlVMNdPMbEo/yCbB22dgrmPaYhbTe2sXVLiN4WH6c5/eTSKDSUwbrSpxpm/b/wxKo2l2 t6DEf/qObRqR0J5jb0GnJuV/3qiaKr3eUdjqwz8Y+DVyVz74dyN7lvLkK94HeFmurkGG X2mFN8tNmqv4Ps0arCz3R/jDCYaUObb4KFZDRR/s3vPci46Mdn1FuljOWkDgCvy892l5 Hg5w== 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=spCm618rU4+U7z1bfdflo8X7NldT43iivpTuZ8WssFA=; b=iA/JlvTvxapmMtNR7skEquCo/JDm0gbG89e+0JGNqCWi2NO6q0zzLNAt51OIeBVmEO UPDMvQQKkHfRZ5koHqmnsBQDcXJQDzZOwQ9lmcedOOwa5R7H14v6Lu5ZxdtZPtOew6ki iACvAUMliCpHb+zU9wfAoAVqc6TVg9UCVrrY6lG9fevs2d562HXGbgpQgIM+TcOjtDFF 0v0qcqd0SjiC/vMZOuX518lGMHTfWVq1XG8EzGBypCyxqCv7ywa84waIdV1x+mWFjiNE Cfd82a3HaE+24f9FTPowYMBL8DdvMn3CagdUyM6skFN0/o4h8h7Z1HGQzDVPZWNSbpmK OXQg== X-Gm-Message-State: AOAM530NWsC/iLB43XWZIl7DW1JwQPqzj15JFebU9+wit1/gktY3t2Bn Vk4/GEiUBfaz6s977qh7L2DtwA== X-Received: by 2002:a1c:4808:: with SMTP id v8mr5734129wma.110.1605119771722; Wed, 11 Nov 2020 10:36:11 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:11 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 16/19] drm/radeon/cik: Move 'Move 'cik_sdma_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:42 +0000 Message-Id: <20201111183545.1756994-17-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik_sdma.c:331:6: warning: no previous prototype for ‘cik_sdma_enable’ [-Wmissing-prototypes] 331 | void cik_sdma_enable(struct radeon_device *rdev, bool enable) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik_sdma.c:528:5: warning: no previous prototype for ‘cik_sdma_resume’ [-Wmissing-prototypes] 528 | int cik_sdma_resume(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik_sdma.c:557:6: warning: no previous prototype for ‘cik_sdma_fini’ [-Wmissing-prototypes] 557 | void cik_sdma_fini(struct radeon_device *rdev) | ^~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 3 --- drivers/gpu/drm/radeon/cik.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 0330ee86a372b..4520ec4c7b2e2 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -129,9 +129,6 @@ MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); -extern int cik_sdma_resume(struct radeon_device *rdev); -extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); -extern void cik_sdma_fini(struct radeon_device *rdev); extern void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); static void cik_rlc_stop(struct radeon_device *rdev); static void cik_pcie_gen3_enable(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 420207d19de52..d1bf541da5923 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -34,4 +34,7 @@ void cik_init_cp_pg_table(struct radeon_device *rdev); u32 cik_get_csb_size(struct radeon_device *rdev); void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); +int cik_sdma_resume(struct radeon_device *rdev); +void cik_sdma_enable(struct radeon_device *rdev, bool enable); +void cik_sdma_fini(struct radeon_device *rdev); #endif /* __CIK_H__ */ From patchwork Wed Nov 11 18:35:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324142 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623163ils; Wed, 11 Nov 2020 10:36:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgxkQmOzULxuBk97nSSMWa/evOSzqJzWYo0Z/Y/S2YNLxINARX8COj4qEzCAH68o7XomCg X-Received: by 2002:a17:90a:f298:: with SMTP id fs24mr5177743pjb.109.1605119784586; Wed, 11 Nov 2020 10:36:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119784; cv=none; d=google.com; s=arc-20160816; b=sOZ4D8Q9RZxI+dLDG/yyKTwLGlGZkQDhb7FOUCJPZvgaXohlw2fz9j6WBXC4nge9k6 dPl/0P+ymTD2uNNeNIrariKhyto8doz6b82dXOGMxJAwQPWpBK02p+6GsEPyduG0ssaE 2/SWQMaTtUXwqOptV1FU7XzXHVhqITaUk4xetst8hy9YK8o71JYRXmkSnE8So59GoHYV WyxRqsMXoVCIeS1qLFw3CwrfH42uExV2O+snKQEgG7vM74bodgZQiPlABILzmdrfqGcu 1FBg4EbUN57kbTJucoSpRJT8VVN4DxMCsBCcc6+3VL46X2BoG2u3IlV0dOp1p0u4OWXD WP5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=bW9LgFCTXbP8pwXueXfHQSHkVs6Ya0gS1GClpvt4D34=; b=se0xST19eT2gRTt5vyvXgHb1nV9zTDa3YSqeamH7h3iD8lxDr9FQQLNFHfZVoRHu6h IvsHmmj7QAPBLvwVpEyaOaQxL/BHQ66dWdDJSGW43LKBPkUPeZLaQkj0g0AoG3BGbqVk uE4xqivN0e//HdMQantVYCi+oRodSxpvylXI11TwdVcuIZq10/O+zo/paQmJar2AHIzu 2w3lcPTBF6xny+8XuB1u3C+TEtIAGKcpB0TsqpKds1So02P6ld3XFZElj3iuxkZte4UU WRWJ/aegFP8d7c7IOTvYswE6MKb1K6aVUG2pAetjOgtMI/WtNlk+dE9yk3AC2d/DdAf0 O4jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Yiw9rQWO; 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 21si1393606pgs.408.2020.11.11.10.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:24 -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=Yiw9rQWO; 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 1B5596E0CE; Wed, 11 Nov 2020 18:36:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 628426E0C9 for ; Wed, 11 Nov 2020 18:36:14 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id d142so3159147wmd.4 for ; Wed, 11 Nov 2020 10:36: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=8BRcDWZ7aXWvQb2HLCmLDCFOcRFyEf3okEuPgH0Vsk4=; b=Yiw9rQWOdIRvZ8Ojv9Qwo3rXzk0WhXlopbtnHAiSY2MaaYuDQYxYpE9t8FlKVukaxa q0cACyMsBPucNhkk/GEIA2b6Duj4q39cgAJxoUb65GjThpVFcNxklrBO4xZjwpHpeP96 07geHWJWkpWuTn1P2bIjY9cRzMTBmbCVrAAE0+iEWadLcrbhNoQOb+mqB7O3KCLriMLp aEtoZDQS6ZpUg3TuPqxJKAFisYH4If35ZF7Te3f4uxc5x6CFZE6G/LNW+ViRlcvnCyvm bnZDjdb+DvKsZqfw3mBI1eDjxvYS1UY7+wqZ4p2zsM//XzdxkE1RIniuKmKKU4zRky6F n/Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8BRcDWZ7aXWvQb2HLCmLDCFOcRFyEf3okEuPgH0Vsk4=; b=PMKhqpCHwyEIF5sxh4V5f6qh9+USS7P8uJmOd6g56iI1och1D8jRpnFxMWk/gT29B8 dTdoxfGYnILwRNFObks/p3nnMdXVnpWzahDi2P1oApni8jE1oK+3wNIgefkz+Sd3ey7u 1sHjWiFBZ2/5havjNDsXvT5sIhSNwxS/bQ5JjfC8PmA3ccX7lHTX0+tomvRB+M0YzN/L Zoyb8gkHWQz0/nwph6cecSbanK1h0jQ75zs290+odnLuP/ClSDcX4CCRBwbwuNBjjXCH MaNX9SYoUGQhPDRqeKl7BtMU8l4AK5IU2Fl3ap2mgFeBbQPnHuzs7C8lKDrFlMa4vMND Be1Q== X-Gm-Message-State: AOAM531+PzoCx6c8o0UFhooJkgOw6X5OPMBCcYXlA18F9VMuGQe4gKz1 z0szL9+VcU5/ladLIFAzOWMy4Q== X-Received: by 2002:a1c:4888:: with SMTP id v130mr5471096wma.84.1605119773011; Wed, 11 Nov 2020 10:36:13 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:12 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 17/19] drm/radeon/si_dpm: Move 'vce_v1_0_enable_mgcg()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:43 +0000 Message-Id: <20201111183545.1756994-18-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/vce_v1_0.c:102:6: warning: no previous prototype for ‘vce_v1_0_enable_mgcg’ [-Wmissing-prototypes] 102 | void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable) | ^~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/si_dpm.c | 3 +-- drivers/gpu/drm/radeon/trinity_dpm.c | 2 +- drivers/gpu/drm/radeon/vce.h | 34 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/vce_v1_0.c | 1 + 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/radeon/vce.h diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index b4581392fbce9..cd07b06301b44 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -35,6 +35,7 @@ #include "si_dpm.h" #include "si.h" #include "sid.h" +#include "vce.h" #define MC_CG_ARB_FREQ_F0 0x0a #define MC_CG_ARB_FREQ_F1 0x0b @@ -1721,8 +1722,6 @@ static const struct si_powertune_data powertune_data_hainan = true }; -extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); - static int si_populate_voltage_value(struct radeon_device *rdev, const struct atom_voltage_table *table, u16 value, SISLANDS_SMC_VOLTAGE_VALUE *voltage); diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c index e005c18aac00e..08ea1c864cb23 100644 --- a/drivers/gpu/drm/radeon/trinity_dpm.c +++ b/drivers/gpu/drm/radeon/trinity_dpm.c @@ -29,6 +29,7 @@ #include "radeon_asic.h" #include "trinity_dpm.h" #include "trinityd.h" +#include "vce.h" #define TRINITY_MAX_DEEPSLEEP_DIVIDER_ID 5 #define TRINITY_MINIMUM_ENGINE_CLOCK 800 @@ -293,7 +294,6 @@ static const u32 trinity_override_mgpg_sequences[] = 0x00000204, 0x00000000, }; -extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); static void trinity_program_clk_gating_hw_sequence(struct radeon_device *rdev, const u32 *seq, u32 count); static void trinity_override_dynamic_mg_powergating(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/vce.h b/drivers/gpu/drm/radeon/vce.h new file mode 100644 index 0000000000000..1eb4f5715202e --- /dev/null +++ b/drivers/gpu/drm/radeon/vce.h @@ -0,0 +1,34 @@ +/* vce.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 2013 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + */ + +#ifndef __VCE_H__ +#define __VCE_H__ + +struct radeon_device; + +void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); + +#endif /* __VCE_H__ */ diff --git a/drivers/gpu/drm/radeon/vce_v1_0.c b/drivers/gpu/drm/radeon/vce_v1_0.c index bd75bbcf5bf63..70c5da2141d75 100644 --- a/drivers/gpu/drm/radeon/vce_v1_0.c +++ b/drivers/gpu/drm/radeon/vce_v1_0.c @@ -30,6 +30,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "sid.h" +#include "vce.h" #define VCE_V1_0_FW_SIZE (256 * 1024) #define VCE_V1_0_STACK_SIZE (64 * 1024) From patchwork Wed Nov 11 18:35:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324144 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623231ils; Wed, 11 Nov 2020 10:36:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkLusBWkVGYIAPEvoGfthdm9ZSn6Ec4UPEWCbJr+XPvtOREq7SnTNHEY4JYvEJbvxkkWND X-Received: by 2002:a62:6107:0:b029:18b:8e8d:917b with SMTP id v7-20020a6261070000b029018b8e8d917bmr23470869pfb.70.1605119790185; Wed, 11 Nov 2020 10:36:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119790; cv=none; d=google.com; s=arc-20160816; b=Y0yjT6uk7yNrJhEM/DzUOVT0W/lFPxzmePHIhizIWmUvcFQJ6hkqGtp+nOzfZXw1TE NJWlbWZslnM5x48wUxeR8C1zmQH3KZrzyLMRF5eELNg/l4OygwJCJyHKN/1+4dMRc8m2 VhwxlNpjICJC/9qJEXei9W4uHuHEHg5GwOJM3HKcP6m+7tk98kYNwhUf6EcLd+YyxYoN RCH+61YO0JDQrVs/3y4+T3ndaRjiWKIbopH/8gimps46G3libwrsp5LP4VcJE8GG3asC FjBLNX9rUbjy5F2ulyFKRHzNVAaOWEf+HALbQVtlXtVqWhOmwADjfVDjmd4T2Dq+2FCQ Y3XQ== 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=KjBSk2AilLfmyyoqMRha3euqSgzsSiweNvrOwFwGFZs=; b=oWSqqXO9mhkDv9BGn5siv33MJlaZgMM0ysxE/vQQ/sykfvY+vjRe/2ob1MYgaFJ36n Qp2CqRaISg0Pi2rOQ87oSuFwHkRzqJ647rHJ2hnRmrluMQu5OPWgM1Lo0HXhuWOhotWD A792ugSRdaHLLR2EtoLwpuj6ZBT8vUss0WEN3KHGeKS7kiFMkmRlozkRpxvkHrCq8Cdu HS6rAearzd5j9fdoYcm1U7WUsq9EX0UmAtN+OwpTwP9FmO22/c2VT+gdM5cZUIjpujj7 7ilRQ+i/6ez7Kpq0WmJGwFN4FSy+5+rn6NWgdPJ0rw2udPgOY+dFlWsUj76r1WWpkljf zLRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=mMr7iJVO; 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 j7si2490333pjn.86.2020.11.11.10.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36: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=mMr7iJVO; 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 2C8106E0D7; Wed, 11 Nov 2020 18:36:29 +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 B89CA6E0C8 for ; Wed, 11 Nov 2020 18:36:15 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id w24so3282529wmi.0 for ; Wed, 11 Nov 2020 10:36: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=tediDzLC047hOPrU32KTbEuOLPsPka6LUr15f9wO3Gk=; b=mMr7iJVO6/1xsFbpADaI0KX7kFyobKLggc8W56w7L3MMk2GfW4ljqeSfLeXhfyLEyj XjcdV/fGWT4uj/ehcXbaUUedrwdLzRksO/j39a1M/QzL8AVDA8lY6o8ZYh2yf6BNOu3e DokwqqpsUUt6tr8S1Kux1Dxrv2cbPTLIvSVIdfRuMbKgQ7Ptr3ZS/s4jeJ8fljJD6sYb v9NXlilvlnlZ68adPseWU4ZZM6H2kZQV/8utnv1rtWscJNiwN2k51ux+q5NmB5aAlXKc ZmV8EL5mCTwd7VfZihKfsERIoxLWBGqCUVn8V9w6s6As362FXbEMbtxmVL7KIepHs4eL rpNg== 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=tediDzLC047hOPrU32KTbEuOLPsPka6LUr15f9wO3Gk=; b=CKh2bINQ0/IZatW4V4yVOCK0a2TOsWFft4qcWMn9ETwL0q1Tzwq/p4H0YOaDEFAdRs SaTCEz3167hDwyV9ioQ33WqslSK3ZYxg4ueDqzpLerb1R/kVS14aTZJc5ekHQotp9knU 2nNQHPL+7k3ZSN8p57uPoorwOjHSbI3Bw6Jptjhb79bmhFYPI10IlX4UrYuxIsAGLYg4 R4emt80FRt5Ie9rccuILgZbUTSI8rmYQvcRwqBsNH4YZFaiuh8aYipSCzIzqaSkUyMzh pdaENeLU+MYbdgUFMCfY1KC5ix9OfmvwkQEgx8uLkcfG28ZahFimz5V/A1KgLOmwrohI pCFQ== X-Gm-Message-State: AOAM5317CpE/fbALJCZFx2WebxaeG/LLdUIBfASXpywF8hnwL21IJeq7 Sc4gxWV/zyGmRLOuygSf/Qs6OQ== X-Received: by 2002:a1c:20d0:: with SMTP id g199mr5981271wmg.68.1605119774423; Wed, 11 Nov 2020 10:36:14 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:13 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 18/19] drm/radeon/cik: Move 'vce_v2_0_enable_mgcg()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:44 +0000 Message-Id: <20201111183545.1756994-19-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-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/vce_v2_0.c:111:6: warning: no previous prototype for ‘vce_v2_0_enable_mgcg’ [-Wmissing-prototypes] 111 | void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable) | ^~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/vce.h | 1 + drivers/gpu/drm/radeon/vce_v2_0.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 4520ec4c7b2e2..ae2a507d13bb7 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -41,6 +41,7 @@ #include "radeon_audio.h" #include "radeon_ucode.h" #include "si.h" +#include "vce.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) @@ -129,7 +130,6 @@ MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); -extern void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); static void cik_rlc_stop(struct radeon_device *rdev); static void cik_pcie_gen3_enable(struct radeon_device *rdev); static void cik_program_aspm(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/vce.h b/drivers/gpu/drm/radeon/vce.h index 1eb4f5715202e..ccc9c00f0d02c 100644 --- a/drivers/gpu/drm/radeon/vce.h +++ b/drivers/gpu/drm/radeon/vce.h @@ -30,5 +30,6 @@ struct radeon_device; void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); +void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); #endif /* __VCE_H__ */ diff --git a/drivers/gpu/drm/radeon/vce_v2_0.c b/drivers/gpu/drm/radeon/vce_v2_0.c index d6fde3659e65f..163c9bfc03da8 100644 --- a/drivers/gpu/drm/radeon/vce_v2_0.c +++ b/drivers/gpu/drm/radeon/vce_v2_0.c @@ -30,6 +30,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "cikd.h" +#include "vce.h" #define VCE_V2_0_FW_SIZE (256 * 1024) #define VCE_V2_0_STACK_SIZE (64 * 1024) From patchwork Wed Nov 11 18:35:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324143 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623196ils; Wed, 11 Nov 2020 10:36:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAxrWzt08I8S/hbUIgA84ec3DEZ3kVAhfpl33xFj7REzEBbaLvXu5joe2rto7UlZFH6j7P X-Received: by 2002:a17:90a:f402:: with SMTP id ch2mr5410995pjb.190.1605119787218; Wed, 11 Nov 2020 10:36:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119787; cv=none; d=google.com; s=arc-20160816; b=eKsHZoZISy2SidHbkyqZ0TVXn4Q90EVdBqo5pKk6Bo8qxXHmLHOrkuiU0vDTyPuYoU xsXn//uVtEP9C10XCXTWIVtGzPiIp2dnz2OXRUmFDad/rwa5b9blVSPHDcizSigLXigY gqqL9o57/XT+0mVUqiNpXNdTBhTmv6eVcWj0QdzdWKhU25bM3xcc6LIAqM9gMaYTubMO UGrsYDfw67BODus+JqCXtBJlB9fXc/lSSPq8F+nHxIjZkFZ2ulPkdaFDgTZHikw9teRL ZIcIQos8/MGeoVj+U/Y6i0Q8QmTLUrrNwmTVIw/Zy5KQFcaowaeaKWqRoRDMRdta7YWW gtAA== 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=fVW5dNIknCqNKjVqQAbRSeuANAYu50csc5frUQVv4cg=; b=QN9TM43yTdIwQuA+7OZwg2+AvyadPY0FIabxdCmObe40SUgkQNv3wHP5vhdyRlgw1B R73SDi0ZLX9SBtLBleM0oAvPaZMfzYle7J06wQ9yMjjuIDujWEpDMZvxmeZLW36Vv0k2 n7++5SfIO55Ud83e2bJJbEOah0RHnwU5ywX7xhCDBK4xeHeyh/Y6D8O2GPr3X9NbpTpz OdRj28aBihBw0PSKMpdzvk/2plmXk6x6DMKV+UMANeyAIUen1txKem8/swr7NRQXnAMu ek2tOWDtKq/o00uKFdbx/diVKPlZ9Weflod7qb0g7R1dkhsQgiL58vlsPWGtTYXVHxbc tDqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gv9rARHr; 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 ls3si2669949pjb.20.2020.11.11.10.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:27 -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=gv9rARHr; 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 14B036E0DC; Wed, 11 Nov 2020 18:36:26 +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 2BB606E0D4 for ; Wed, 11 Nov 2020 18:36:17 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id p1so3479805wrf.12 for ; Wed, 11 Nov 2020 10:36: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=1BMpKgrGRaaFsrowXlZeUlkXnTCJQ5S+7+zF8aRI5RM=; b=gv9rARHr4D0R1XbUNjjQpIHG+8Ukz+VROemjmN9deTxOLLwa57CGwe7Yw2nPVD5LkI x7sBA5S4Izl8Y+DLOybIvelf93pnTPj30GwSDjNqThbgY52WPq9pGugtalPjo4Me6wOi v3Wf9SH9nuttFyN/EE8mWWiXT3JxVUq06ieJknk5W231WtKu0+8a6uSy7vdh1HVUK8ea 2AC/M3H/iD7QdDK/feCxSxKB0ScDF6vwy8oQrAZTdgXy/8X1ALdG+Vxo9y/csOsWa8Qz txo6oqrG/NN9rdWgI6GsC3//RR1aBRg7CpXQRIiN8lqFXulSkUJ5ArqmT2m75r2FCIsu /yXQ== 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=1BMpKgrGRaaFsrowXlZeUlkXnTCJQ5S+7+zF8aRI5RM=; b=QMKsT4AAirnBjSVva6fqRfVBS+7KlrhJ6I0XXGI9M5pzWu7Fbyft77Q1ov7bD9hKZB f5LiHEJX085ByNxRRry097r1wtJz7ei/owkxVNTjzcEKwYAE42dCg0hBbQq7DdSYpokF AskI7SblHUNduiBi/3VYEQMu8EKhnS6IEafXhZTGmzsOdmA+XpPidE4VcXh6cWPYQ0Ec 1uYYxErjoyoz+i2cXzyj9SM6CL1k8zb6EySeu4zEEVv8o6I//FJcxx3ecgjFdonzDUtg HSuDfmQgV3b+iuNT0iz69Rh4RzRo5Oa2WSMt9XV2SLjETIJkKmHwMPveasNuRu2TRH/U Ns+w== X-Gm-Message-State: AOAM53184TszPRWOonvtyNYzFNnPJv2vYaMgKsLFnp9TadU2SPpwsXYt Grtogwe4hSVu5OHD/Ld7c77IPw== X-Received: by 2002:a5d:474d:: with SMTP id o13mr33192388wrs.178.1605119775741; Wed, 11 Nov 2020 10:36:15 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:15 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 19/19] drm/radeon/evergreen_cs: Move 'r600_dma_cs_next_reloc()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:45 +0000 Message-Id: <20201111183545.1756994-20-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/r600_cs.c:2343:5: warning: no previous prototype for ‘r600_dma_cs_next_reloc’ [-Wmissing-prototypes] 2343 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, | ^~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/evergreen_cs.c | 3 +-- drivers/gpu/drm/radeon/r600.h | 4 ++++ drivers/gpu/drm/radeon/r600_cs.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 53b75cf201958..0de79f3a7e3ff 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -28,6 +28,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "evergreend.h" #include "evergreen_reg_safe.h" #include "cayman_reg_safe.h" @@ -37,8 +38,6 @@ #define REG_SAFE_BM_SIZE ARRAY_SIZE(evergreen_reg_safe_bm) -int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, - struct radeon_bo_list **cs_reloc); struct evergreen_cs_track { u32 group_size; u32 nbanks; diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h index a259976a95913..21fe44198a966 100644 --- a/drivers/gpu/drm/radeon/r600.h +++ b/drivers/gpu/drm/radeon/r600.h @@ -29,7 +29,9 @@ #define __R600_H__ struct r600_audio_pin; +struct radeon_bo_list; struct radeon_crtc; +struct radeon_cs_parser; struct radeon_device; struct radeon_hdmi_acr; @@ -50,4 +52,6 @@ void r600_hdmi_update_acr(struct drm_encoder *encoder, long offset, void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); +int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, + struct radeon_bo_list **cs_reloc); #endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index f20b619466816..dc68e538d5a97 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -29,6 +29,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "r600d.h" #include "r600_reg_safe.h"