Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08f28fd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-fixes-2015-06-03' of... 

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.
parents 0546b72b 826f5de8

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+2 −2
Original line number Diff line number Diff line
@@ -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",