On 18/09/17 08:48 AM, Christian König wrote:
> Am 18.09.2017 um 14:35 schrieb Tom St Denis:
>> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
>> ---
>> Â drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 53
>> ++++++++++++++++++---------------
>> Â drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h |Â 4 +--
>> Â 2 files changed, 31 insertions(+), 26 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> index 8ee16dfdb8af..7848ffa99eb4 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> @@ -1809,6 +1809,18 @@ static const struct file_operations
>> amdgpu_ttm_gtt_fops = {
>> Â #endif
>> +
>> +
>> +static const struct {
>> +Â Â Â char *name;
>> +Â Â Â const struct file_operations *fops;
>> +} ttm_debugfs_entries[] = {
>> +Â Â Â { "amdgpu_vram", &amdgpu_ttm_vram_fops },
>> +#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
>> +Â Â Â { "amdgpu_gtt", &amdgpu_ttm_gtt_fops },
>> +#endif
>> +};
>> +
>> Â #endif
>> Â static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
>> @@ -1819,22 +1831,21 @@ static int amdgpu_ttm_debugfs_init(struct
>> amdgpu_device *adev)
>> Â Â Â Â Â struct drm_minor *minor = adev->ddev->primary;
>> Â Â Â Â Â struct dentry *ent, *root = minor->debugfs_root;
>> -Â Â Â ent = debugfs_create_file("amdgpu_vram", S_IFREG | S_IRUGO, root,
>> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â adev, &amdgpu_ttm_vram_fops);
>> -Â Â Â if (IS_ERR(ent))
>> -Â Â Â Â Â Â Â return PTR_ERR(ent);
>> -Â Â Â i_size_write(ent->d_inode, adev->mc.mc_vram_size);
>> -Â Â Â adev->mman.vram = ent;
>> -
>> -#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
>> -Â Â Â ent = debugfs_create_file("amdgpu_gtt", S_IFREG | S_IRUGO, root,
>> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â adev, &amdgpu_ttm_gtt_fops);
>> -Â Â Â if (IS_ERR(ent))
>> -Â Â Â Â Â Â Â return PTR_ERR(ent);
>> -Â Â Â i_size_write(ent->d_inode, adev->mc.gart_size);
>> -Â Â Â adev->mman.gtt = ent;
>> +Â Â Â for (count = 0; count < ARRAY_SIZE(ttm_debugfs_entries); count++) {
>> +Â Â Â Â Â Â Â ent = debugfs_create_file(
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ttm_debugfs_entries[count].name,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â S_IFREG | S_IRUGO, root,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â adev,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ttm_debugfs_entries[count].fops);
>> +Â Â Â Â Â Â Â if (IS_ERR(ent))
>> +Â Â Â Â Â Â Â Â Â Â Â return PTR_ERR(ent);
>> +Â Â Â Â Â Â Â if (!strcmp(ttm_debugfs_entries[count].name, "amdgpu_vram"))
>> +Â Â Â Â Â Â Â Â Â Â Â i_size_write(ent->d_inode, adev->mc.mc_vram_size);
>> +Â Â Â Â Â Â Â else if (!strcmp(ttm_debugfs_entries[count].name, "amdgpu_gtt"))
>> +Â Â Â Â Â Â Â Â Â Â Â i_size_write(ent->d_inode, adev->mc.gart_size);
>
> Uff, string compare? That is screaming break me by typo.
>
> Maybe but the domain type into the struct as well?
>
> Apart from that looks good to me,
Sure, a quick grep didn't turn up any defines/enums for VRAM vs GTT
though so just make some up?
Tom
