* [PATCH 0/4] KFD upstreaming
@ 2020-04-30 0:00 Felix Kuehling
2020-04-30 0:00 ` [PATCH 1/4] drm/amdkfd: Report domain with topology Felix Kuehling
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Felix Kuehling @ 2020-04-30 0:00 UTC (permalink / raw)
To: amd-gfx
A few small patches found during DKMS branch rebasing that were
missing from amd-staging-drm-next for no good reason.
Felix Kuehling (2):
drm/amdkfd: Fix comment formatting
drm/amdgpu: Add missing parameter description in comments
Oak Zeng (1):
drm/amdgpu: Changed CU reservation golden settings
Ori Messinger (1):
drm/amdkfd: Report domain with topology
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 +
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +++
drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 +
include/uapi/linux/kfd_ioctl.h | 2 +-
7 files changed, 11 insertions(+), 5 deletions(-)
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/4] drm/amdkfd: Report domain with topology 2020-04-30 0:00 [PATCH 0/4] KFD upstreaming Felix Kuehling @ 2020-04-30 0:00 ` Felix Kuehling 2020-04-30 0:00 ` [PATCH 2/4] drm/amdgpu: Changed CU reservation golden settings Felix Kuehling ` (3 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Felix Kuehling @ 2020-04-30 0:00 UTC (permalink / raw) To: amd-gfx; +Cc: Ori Messinger From: Ori Messinger <Ori.Messinger@amd.com> PCI domain has moved to 32-bits to accommodate virtualization, so a 32-bit integer is exposed for domain to reflect this change. Domain can be found in here: /sys/class/kfd/kfd/topology/nodes/X/properties Where X is the card number Signed-off-by: Ori Messinger <ori.messinger@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +++ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index bc4a22df12d7..bb77f7af2b6d 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -478,6 +478,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->node_props.device_id); sysfs_show_32bit_prop(buffer, "location_id", dev->node_props.location_id); + sysfs_show_32bit_prop(buffer, "domain", + dev->node_props.domain); sysfs_show_32bit_prop(buffer, "drm_render_minor", dev->node_props.drm_render_minor); sysfs_show_64bit_prop(buffer, "hive_id", @@ -1306,6 +1308,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) HSA_CAP_ASIC_REVISION_SHIFT) & HSA_CAP_ASIC_REVISION_MASK); dev->node_props.location_id = pci_dev_id(gpu->pdev); + dev->node_props.domain = pci_domain_nr(gpu->pdev->bus); dev->node_props.max_engine_clk_fcompute = amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd); dev->node_props.max_engine_clk_ccompute = diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h index 0c51bd3dcd59..326d9b26b7aa 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h @@ -80,6 +80,7 @@ struct kfd_node_properties { uint32_t vendor_id; uint32_t device_id; uint32_t location_id; + uint32_t domain; uint32_t max_engine_clk_fcompute; uint32_t max_engine_clk_ccompute; int32_t drm_render_minor; -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] drm/amdgpu: Changed CU reservation golden settings 2020-04-30 0:00 [PATCH 0/4] KFD upstreaming Felix Kuehling 2020-04-30 0:00 ` [PATCH 1/4] drm/amdkfd: Report domain with topology Felix Kuehling @ 2020-04-30 0:00 ` Felix Kuehling 2020-04-30 0:00 ` [PATCH 3/4] drm/amdkfd: Fix comment formatting Felix Kuehling ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Felix Kuehling @ 2020-04-30 0:00 UTC (permalink / raw) To: amd-gfx; +Cc: Alex Deucher, Oak Zeng From: Oak Zeng <Oak.Zeng@amd.com> With previous golden settings, compute task can't use reserved LDS (32K) on CU0 and CU1. On 64K LDS system, if compute work group allocate more than 32K LDS, then it can't be dispatched to CU0 and CU1 because of the reservation. This enables compute task to use reserved LDS on CU0 and CU1. Signed-off-by: Oak Zeng <Oak.Zeng@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Felix Kuehling <felix.kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 2767c6d03370..a4e95e03d97c 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -507,8 +507,8 @@ static const struct soc15_reg_golden golden_settings_gc_9_0[] = SOC15_REG_GOLDEN_VALUE(GC, 0, mmSH_MEM_CONFIG, 0x00001000, 0x00001000), SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_RESOURCE_RESERVE_CU_0, 0x0007ffff, 0x00000800), SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_RESOURCE_RESERVE_CU_1, 0x0007ffff, 0x00000800), - SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_RESOURCE_RESERVE_EN_CU_0, 0x01ffffff, 0x0000ff87), - SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_RESOURCE_RESERVE_EN_CU_1, 0x01ffffff, 0x0000ff8f), + SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_RESOURCE_RESERVE_EN_CU_0, 0x01ffffff, 0x00ffff87), + SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_RESOURCE_RESERVE_EN_CU_1, 0x01ffffff, 0x00ffff8f), SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQC_CONFIG, 0x03000000, 0x020a2000), SOC15_REG_GOLDEN_VALUE(GC, 0, mmTA_CNTL_AUX, 0xfffffeef, 0x010b0000), SOC15_REG_GOLDEN_VALUE(GC, 0, mmTCP_CHAN_STEER_HI, 0xffffffff, 0x4a2c0e68), -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] drm/amdkfd: Fix comment formatting 2020-04-30 0:00 [PATCH 0/4] KFD upstreaming Felix Kuehling 2020-04-30 0:00 ` [PATCH 1/4] drm/amdkfd: Report domain with topology Felix Kuehling 2020-04-30 0:00 ` [PATCH 2/4] drm/amdgpu: Changed CU reservation golden settings Felix Kuehling @ 2020-04-30 0:00 ` Felix Kuehling 2020-04-30 0:00 ` [PATCH 4/4] drm/amdgpu: Add missing parameter description in comments Felix Kuehling 2020-04-30 12:31 ` [PATCH 0/4] KFD upstreaming Russell, Kent 4 siblings, 0 replies; 7+ messages in thread From: Felix Kuehling @ 2020-04-30 0:00 UTC (permalink / raw) To: amd-gfx Corrected two function names. Added a missing space. Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++-- include/uapi/linux/kfd_ioctl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 598296034b43..d27221ddcdeb 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -1122,7 +1122,7 @@ struct kfd_process *kfd_lookup_process_by_mm(const struct mm_struct *mm) return p; } -/* process_evict_queues - Evict all user queues of a process +/* kfd_process_evict_queues - Evict all user queues of a process * * Eviction is reference-counted per process-device. This means multiple * evictions from different sources can be nested safely. @@ -1162,7 +1162,7 @@ int kfd_process_evict_queues(struct kfd_process *p) return r; } -/* process_restore_queues - Restore all user queues of a process */ +/* kfd_process_restore_queues - Restore all user queues of a process */ int kfd_process_restore_queues(struct kfd_process *p) { struct kfd_process_device *pdd; diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index 4f6676428c5c..b6be62356d34 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -251,7 +251,7 @@ struct kfd_memory_exception_failure { __u32 imprecise; /* Can't determine the exact fault address */ }; -/* memory exception data*/ +/* memory exception data */ struct kfd_hsa_memory_exception_data { struct kfd_memory_exception_failure failure; __u64 va; -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] drm/amdgpu: Add missing parameter description in comments 2020-04-30 0:00 [PATCH 0/4] KFD upstreaming Felix Kuehling ` (2 preceding siblings ...) 2020-04-30 0:00 ` [PATCH 3/4] drm/amdkfd: Fix comment formatting Felix Kuehling @ 2020-04-30 0:00 ` Felix Kuehling 2020-04-30 12:31 ` [PATCH 0/4] KFD upstreaming Russell, Kent 4 siblings, 0 replies; 7+ messages in thread From: Felix Kuehling @ 2020-04-30 0:00 UTC (permalink / raw) To: amd-gfx Kerneldoc comments should describe all function parameters. Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index e8529e244a2b..bcd4baecfe11 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c @@ -762,6 +762,7 @@ static void gmc_v7_0_gart_disable(struct amdgpu_device *adev) * @adev: amdgpu_device pointer * @status: VM_CONTEXT1_PROTECTION_FAULT_STATUS register value * @addr: VM_CONTEXT1_PROTECTION_FAULT_ADDR register value + * @mc_client: VM_CONTEXT1_PROTECTION_FAULT_MCCLIENT register value * * Print human readable fault information (CIK). */ diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 0aa5b82808d1..26976e50e2a2 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -1005,6 +1005,7 @@ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev) * @adev: amdgpu_device pointer * @status: VM_CONTEXT1_PROTECTION_FAULT_STATUS register value * @addr: VM_CONTEXT1_PROTECTION_FAULT_ADDR register value + * @mc_client: VM_CONTEXT1_PROTECTION_FAULT_MCCLIENT register value * * Print human readable fault information (VI). */ -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH 0/4] KFD upstreaming 2020-04-30 0:00 [PATCH 0/4] KFD upstreaming Felix Kuehling ` (3 preceding siblings ...) 2020-04-30 0:00 ` [PATCH 4/4] drm/amdgpu: Add missing parameter description in comments Felix Kuehling @ 2020-04-30 12:31 ` Russell, Kent 2020-04-30 13:44 ` Alex Deucher 4 siblings, 1 reply; 7+ messages in thread From: Russell, Kent @ 2020-04-30 12:31 UTC (permalink / raw) To: Kuehling, Felix, amd-gfx [AMD Official Use Only - Internal Distribution Only] You can add Reviewed-By Kent Russell <kent.russell> for patches 3 and 4 and use them for 1/2 if needed (since they were already reviewed/acked by you or Alex). Kent > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Felix > Kuehling > Sent: Wednesday, April 29, 2020 8:01 PM > To: amd-gfx@lists.freedesktop.org > Subject: [PATCH 0/4] KFD upstreaming > > A few small patches found during DKMS branch rebasing that were missing > from amd-staging-drm-next for no good reason. > > Felix Kuehling (2): > drm/amdkfd: Fix comment formatting > drm/amdgpu: Add missing parameter description in comments > > Oak Zeng (1): > drm/amdgpu: Changed CU reservation golden settings > > Ori Messinger (1): > drm/amdkfd: Report domain with topology > > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++-- > drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +++ > drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + > include/uapi/linux/kfd_ioctl.h | 2 +- > 7 files changed, 11 insertions(+), 5 deletions(-) > > -- > 2.17.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr > eedesktop.org%2Fmailman%2Flistinfo%2Famd- > gfx&data=02%7C01%7Ckent.russell%40amd.com%7C04b4185d714a4375 > 46bc08d7ec99a178%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C > 637238017505884390&sdata=eFMYK%2FzJBYAzQz7BOAqmMR1QOhRMe > nh0KXIEhYsv0bI%3D&reserved=0 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] KFD upstreaming 2020-04-30 12:31 ` [PATCH 0/4] KFD upstreaming Russell, Kent @ 2020-04-30 13:44 ` Alex Deucher 0 siblings, 0 replies; 7+ messages in thread From: Alex Deucher @ 2020-04-30 13:44 UTC (permalink / raw) To: Russell, Kent; +Cc: Kuehling, Felix, amd-gfx 1,2: Acked-by: Alex Deucher <alexander.deucher@amd.com> 3, 4: Reviewed-by: Alex Deucher <alexander.deucher@amd.com> On Thu, Apr 30, 2020 at 8:31 AM Russell, Kent <Kent.Russell@amd.com> wrote: > > [AMD Official Use Only - Internal Distribution Only] > > You can add Reviewed-By Kent Russell <kent.russell> for patches 3 and 4 and use them for 1/2 if needed (since they were already reviewed/acked by you or Alex). > > Kent > > > -----Original Message----- > > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Felix > > Kuehling > > Sent: Wednesday, April 29, 2020 8:01 PM > > To: amd-gfx@lists.freedesktop.org > > Subject: [PATCH 0/4] KFD upstreaming > > > > A few small patches found during DKMS branch rebasing that were missing > > from amd-staging-drm-next for no good reason. > > > > Felix Kuehling (2): > > drm/amdkfd: Fix comment formatting > > drm/amdgpu: Add missing parameter description in comments > > > > Oak Zeng (1): > > drm/amdgpu: Changed CU reservation golden settings > > > > Ori Messinger (1): > > drm/amdkfd: Report domain with topology > > > > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- > > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + > > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + > > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++-- > > drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +++ > > drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + > > include/uapi/linux/kfd_ioctl.h | 2 +- > > 7 files changed, 11 insertions(+), 5 deletions(-) > > > > -- > > 2.17.1 > > > > _______________________________________________ > > amd-gfx mailing list > > amd-gfx@lists.freedesktop.org > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr > > eedesktop.org%2Fmailman%2Flistinfo%2Famd- > > gfx&data=02%7C01%7Ckent.russell%40amd.com%7C04b4185d714a4375 > > 46bc08d7ec99a178%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C > > 637238017505884390&sdata=eFMYK%2FzJBYAzQz7BOAqmMR1QOhRMe > > nh0KXIEhYsv0bI%3D&reserved=0 > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-04-30 13:45 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-30 0:00 [PATCH 0/4] KFD upstreaming Felix Kuehling 2020-04-30 0:00 ` [PATCH 1/4] drm/amdkfd: Report domain with topology Felix Kuehling 2020-04-30 0:00 ` [PATCH 2/4] drm/amdgpu: Changed CU reservation golden settings Felix Kuehling 2020-04-30 0:00 ` [PATCH 3/4] drm/amdkfd: Fix comment formatting Felix Kuehling 2020-04-30 0:00 ` [PATCH 4/4] drm/amdgpu: Add missing parameter description in comments Felix Kuehling 2020-04-30 12:31 ` [PATCH 0/4] KFD upstreaming Russell, Kent 2020-04-30 13:44 ` Alex Deucher
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.