[AMD Official Use Only]
This works, now I'm facing other issues. Like we call the VCN block on navi10 a "uvd 2.0.0". Originally I was only accepting exact major hits which meant my navi10 model had no video enc/dec block once I programmed it to take the closest match it hit UVD 4.0.0 (pre-soc15/etc) and that's obviously wrong.
Shouldn't IP discovered video enc/dec be name VCN?
On a semi related note we have no SDMA v5.x.y headers in the tree but navi10+ uses it. I guess the driver just uses SDMA 4.x.y headers because they're close enough but it means umr won't load in an SDMA model.
Which then gets us into weird conditions. Right now I'm programming umr to find the closet abs() major hit, then minor, then revision. But I imagine we'll hit cases where say version X.Y+1.Z is better than X.Y-1.Z and vice versa (etc with the other fields). There's no way for umr to know if a newer or older header is better.
Tom
________________________________________
From: Tuikov, Luben <Luben.Tuikov@xxxxxxx>
Sent: Thursday, February 17, 2022 11:35
To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
Cc: Tuikov, Luben; Deucher, Alexander; StDenis, Tom
Subject: [PATCH] drm/amdgpu: Dynamically initialize IP instance attributes
Dynamically initialize IP instance attributes. This eliminates bugs
stemming from adding new attributes to an IP instance.
Cc: Alex Deucher <Alexander.Deucher@xxxxxxx>
Reported-by: Tom StDenis <tom.stdenis@xxxxxxx>
Fixes: c10b6aa7417b0a ("drm/amdgpu: Add "harvest" to IP discovery sysfs")
Signed-off-by: Luben Tuikov <luben.tuikov@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 6c7ec058125e1d..5848fec5c39251 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -482,16 +482,7 @@ static struct ip_hw_instance_attr ip_hw_attr[] = {
__ATTR_RO(base_addr),
};
-static struct attribute *ip_hw_instance_attrs[] = {
- &ip_hw_attr[0].attr,
- &ip_hw_attr[1].attr,
- &ip_hw_attr[2].attr,
- &ip_hw_attr[3].attr,
- &ip_hw_attr[4].attr,
- &ip_hw_attr[5].attr,
- &ip_hw_attr[6].attr,
- NULL,
-};
+static struct attribute *ip_hw_instance_attrs[ARRAY_SIZE(ip_hw_attr) + 1];
ATTRIBUTE_GROUPS(ip_hw_instance);
#define to_ip_hw_instance(x) container_of(x, struct ip_hw_instance, kobj)
@@ -789,7 +780,7 @@ static int amdgpu_discovery_sysfs_recurse(struct amdgpu_device *adev)
static int amdgpu_discovery_sysfs_init(struct amdgpu_device *adev)
{
struct kset *die_kset;
- int res;
+ int res, ii;
adev->ip_top = kzalloc(sizeof(*adev->ip_top), GFP_KERNEL);
if (!adev->ip_top)
@@ -814,6 +805,10 @@ static int amdgpu_discovery_sysfs_init(struct amdgpu_device *adev)
goto Err;
}
+ for (ii = 0; ii < ARRAY_SIZE(ip_hw_attr); ii++)
+ ip_hw_instance_attrs[ii] = &ip_hw_attr[ii].attr;
+ ip_hw_instance_attrs[ii] = NULL;
+
res = amdgpu_discovery_sysfs_recurse(adev);
return res;
base-commit: f736148ca7bf82654141a4411409c2d7a9e2269b
--
2.35.1.129.gb80121027d
