diff options
| author | Dave Airlie | 2015-06-04 04:29:04 +0200 |
|---|---|---|
| committer | Dave Airlie | 2015-06-04 04:29:04 +0200 |
| commit | e08f28fdda4ef0df5254d47ef44397c0f99d32ea (patch) | |
| tree | 9c0db84595ee091784bb5f894244f5cfda9ba6cb /drivers/gpu | |
| parent | Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | drm/amdkfd: fix topology bug with capability attr. (diff) | |
| download | kernel-qcow2-linux-e08f28fdda4ef0df5254d47ef44397c0f99d32ea.tar.gz kernel-qcow2-linux-e08f28fdda4ef0df5254d47ef44397c0f99d32ea.tar.xz kernel-qcow2-linux-e08f28fdda4ef0df5254d47ef44397c0f99d32ea.zip | |
Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes
One minor fix for last -rc of 4.1. The fix moves the update of an attribute in
topology to *after* it is actually initialized.
* tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux:
drm/amdkfd: fix topology bug with capability attr.
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index e469c4b2e8cc..c25728bc388a 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -684,8 +684,6 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->node_props.cpu_core_id_base); sysfs_show_32bit_prop(buffer, "simd_id_base", dev->node_props.simd_id_base); - sysfs_show_32bit_prop(buffer, "capability", - dev->node_props.capability); sysfs_show_32bit_prop(buffer, "max_waves_per_simd", dev->node_props.max_waves_per_simd); sysfs_show_32bit_prop(buffer, "lds_size_in_kb", @@ -736,6 +734,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->gpu->kfd2kgd->get_fw_version( dev->gpu->kgd, KGD_ENGINE_MEC1)); + sysfs_show_32bit_prop(buffer, "capability", + dev->node_props.capability); } return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute", |