Skip to contentSkip to conversation

Add MMHUB 3.0 support

PATCH New Alex Deucher 1 participant 2 messages Apr 28, 2022

Subsystems (2)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

cover Add MMHUB 3.0 support

MultiMedia Hub (MMHUB) is the memory hub for media engines on the GPU. This adds support for version 3.0. Patch 1 is register headers and is too large for the mailing list so I did not include it.

Hawking Zhang (1):
drm/amdgpu: add mmhub v3_0_0 ip headers v6

Tianci.Yin (1):
drm/amdgpu: add mmhub v3_0 ip block

 drivers/gpu/drm/amd/amdgpu/Makefile           |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h       |    1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h     |    1 +
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c       |  576 ++
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h       |   28 +
 .../asic_reg/mmhub/mmhub_3_0_0_offset.h       | 1529 ++++
 .../asic_reg/mmhub/mmhub_3_0_0_sh_mask.h      | 7478 +++++++++++++++++
 7 files changed, 9614 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_0_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_0_sh_mask.h
Signature · 1 line
2.35.1
author maintainer
#1 lore raw

PATCH 2/2 drm/amdgpu: add mmhub v3_0 ip block

From: "Tianci.Yin" <[email protected]>

Add support for mmhub v3.0

---
 drivers/gpu/drm/amd/amdgpu/Makefile       |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h   |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h |   1 +
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c   | 576 ++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h   |  28 ++
 5 files changed, 607 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
index 5d447a38e63c..156de606f275 100644
@@ -88,7 +88,7 @@ amdgpu-y += \
 	gmc_v8_0.o \
 	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o gfxhub_v1_1.o mmhub_v9_4.o \
 	gfxhub_v2_0.o mmhub_v2_0.o gmc_v10_0.o gfxhub_v2_1.o mmhub_v2_3.o \
-	mmhub_v1_7.o gfxhub_v3_0.o
+	mmhub_v1_7.o gfxhub_v3_0.o mmhub_v3_0.o
 
 # add UMC block
 amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +1 -0
index e7dc069c4512..4be6b657944a 100644
@@ -101,6 +101,7 @@ struct amdgpu_vmhub {
 	uint32_t	eng_addr_distance; /* include LO32/HI32 */
 
 	uint32_t	vm_cntx_cntl_vm_fault;
+	uint32_t	vm_l2_bank_select_reserved_cid2;
 
 	const struct amdgpu_vmhub_funcs *vmhub_funcs;
 };
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h +1 -0
index f939395c5914..93430d3823c9 100644
@@ -27,6 +27,7 @@ struct amdgpu_mmhub_ras {
 
 struct amdgpu_mmhub_funcs {
 	u64 (*get_fb_location)(struct amdgpu_device *adev);
+	u64 (*get_mc_fb_offset)(struct amdgpu_device *adev);
 	void (*init)(struct amdgpu_device *adev);
 	int (*gart_enable)(struct amdgpu_device *adev);
 	void (*set_fault_enable_default)(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c new file +576 -0

576 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h new file +28 -0
new file mode 100644
index 000000000000..3ced20f350bb
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 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 __MMHUB_V3_0_H__
+#define __MMHUB_V3_0_H__
+
+extern const struct amdgpu_mmhub_funcs mmhub_v3_0_funcs;
+
+#endif
Signature · 1 line
2.35.1