From: Graham Sider <Graham.Sider@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: <felix.kuehling@amd.com>, <mukul.joshi@amd.com>,
Graham Sider <Graham.Sider@amd.com>
Subject: [PATCH 01/13] drm/amdkfd: add amdgpu_device entry to kfd_dev
Date: Tue, 19 Oct 2021 17:13:22 -0400 [thread overview]
Message-ID: <20211019211334.1552825-1-Graham.Sider@amd.com> (raw)
Patch series to remove kgd_dev struct and replace all instances with
amdgpu_device objects.
amdgpu_device needs to be declared in kgd_kfd_interface.h to be visible
to kfd2kgd_calls.
Signed-off-by: Graham Sider <Graham.Sider@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 +
drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 0fffaf859c59..81ca00d7b3da 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -825,6 +825,7 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, bool vf)
return NULL;
kfd->kgd = kgd;
+ kfd->adev = adev;
kfd->device_info = device_info;
kfd->pdev = pdev;
kfd->init_complete = false;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 6d8f9bb2d905..c8bd062fb954 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -229,6 +229,7 @@ struct kfd_vmid_info {
struct kfd_dev {
struct kgd_dev *kgd;
+ struct amdgpu_device *adev;
const struct kfd_device_info *device_info;
struct pci_dev *pdev;
diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
index c84bd7b2cf59..ba444cbf9206 100644
--- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@ -33,6 +33,7 @@
#include <linux/dma-fence.h>
struct pci_dev;
+struct amdgpu_device;
#define KGD_MAX_QUEUES 128
--
2.25.1
next reply other threads:[~2021-10-19 21:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 21:13 Graham Sider [this message]
2021-10-19 21:13 ` [PATCH 02/13] drm/amdkfd: replace kgd_dev in static gfx v7 funcs Graham Sider
2021-10-26 20:06 ` Felix Kuehling
2021-10-26 20:31 ` Sider, Graham
2021-10-26 21:11 ` Felix Kuehling
2021-10-19 21:13 ` [PATCH 03/13] drm/amdkfd: replace kgd_dev in static gfx v8 funcs Graham Sider
2021-10-19 21:13 ` [PATCH 04/13] drm/amdkfd: replace kgd_dev in static gfx v9 funcs Graham Sider
2021-10-19 21:13 ` [PATCH 05/13] drm/amdkfd: replace kgd_dev in static gfx v10 funcs Graham Sider
2021-10-19 21:13 ` [PATCH 06/13] drm/amdkfd: replace kgd_dev in static gfx v10_3 funcs Graham Sider
2021-10-19 21:13 ` [PATCH 07/13] drm/amdkfd: replace kgd_dev in hqd/mqd kfd2kgd funcs Graham Sider
2021-10-19 21:13 ` [PATCH 08/13] drm/amdkfd: replace kgd_dev in various " Graham Sider
2021-10-19 21:13 ` [PATCH 09/13] drm/amdkfd: replace kgd_dev in various amgpu_amdkfd funcs Graham Sider
2021-10-19 21:13 ` [PATCH 10/13] drm/amdkfd: replace kgd_dev in get amdgpu_amdkfd funcs Graham Sider
2021-10-26 21:23 ` Felix Kuehling
2021-10-26 22:12 ` Sider, Graham
2021-10-19 21:13 ` [PATCH 11/13] drm/amdkfd: replace kgd_dev in gpuvm " Graham Sider
2021-10-19 21:13 ` [PATCH 12/13] drm/amdkfd: replace/remove remaining kgd_dev references Graham Sider
2021-10-19 21:13 ` [PATCH 13/13] drm/amdkfd: remove kgd_dev declaration and initialization Graham Sider
2021-10-26 21:30 ` [PATCH 01/13] drm/amdkfd: add amdgpu_device entry to kfd_dev Felix Kuehling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211019211334.1552825-1-Graham.Sider@amd.com \
--to=graham.sider@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=felix.kuehling@amd.com \
--cc=mukul.joshi@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox