drm/amdgpu: Move VBIOS version to sysfs
Subsystems (2)
PATCH 1/1 drm/amdgpu: Move VBIOS version to sysfs
sysfs is more stable, and doesn't require root to access
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +23 -31
@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = {"TAHITI" ,
@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios *
@@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/**
@@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;
@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }
@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)DRM_ERROR ("Creating vbios dump debugfs failed (%d).\n" , r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves (adev);
@@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0; } -static int amdgpu_debugfs_get_vbios_version (struct seq_file *m,void *data) -{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {
@@ -3897,9 +3893,5 @@ static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) {return 0 ; } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1503668585-27962-1-git-send-email-kent.russell-5C7GfCeVMHo@public.gmane.org
Tom St Denis
Acked-bySeems to be the easiest way to find this is via
/sys/bus/pci/devices/${devname}/vbios_version
Tom
Quoted 123 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +23
-27@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = {"TAHITI" ,@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios * @@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)DRM_ERROR ("Creating vbios dump debugfs failed (%d).\n" , r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves (adev);@@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0; } -static int amdgpu_debugfs_get_vbios_version (struct seq_file *m,void *data) -{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) · line 3897
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4@@ -3897,9 +3893,5 @@ static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) {return 0 ; } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 60b4865c-9989-8a20-b200-050e6ff8a441-5C7GfCeVMHo@public.gmane.org
Russell, Kent
Acked-by Tom St DenisThat's right, it'll be in there, or the sym-linked /sys/class/drm/card0/device , depending on how you like to find the amdgpu device sysfs files.
Kent
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Friday, August 25, 2017 9:59 AM
To: [email protected]
Subject: Re: [PATCH] drm/amdgpu: Move VBIOS version to sysfs
Seems to be the easiest way to find this is via
/sys/bus/pci/devices/${devname}/vbios_version
Tom
Quoted 124 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +22
-24@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init(structamdgpu_device *adev);static const char *amdgpu_asic_name[] = {"TAHITI" ,@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); } + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios * @@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)DRM_ERROR ("Creating vbios dump debugfs failed (%d).\n" , r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves (adev);@@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)return 0 ; } -static int amdgpu_debugfs_get_vbios_version (struct seq_file *m,void *data) -{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) · line 3897
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3@@ -3897,9 +3893,5 @@ static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) {return 0 ; } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 3 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>
Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Alex
Quoted 131 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +23
-32@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = {"TAHITI" ,@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios * @@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)DRM_ERROR ("Creating vbios dump debugfs failed (%d).\n" , r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves (adev);@@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0; } -static int amdgpu_debugfs_get_vbios_version (struct seq_file *m,void *data) -{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {@@ -3897,9 +3893,5 @@ static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) {return 0 ; } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_MYCTT73r0X_=JCtTVkYb-2_oK1LQQb85-dQk3V-wud0Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Christian was saying that the VBIOS binary should remain in debugfs (on the other thread). I'll let you two discuss, since I have zero vested interest in the location of the VBIOS binary :)
Kent
-----Original Message-----
From: Alex Deucher [mailto:[email protected]]
Sent: Friday, August 25, 2017 10:41 AM
To: Russell, Kent
Cc: amd-gfx list
Subject: Re: [PATCH] drm/amdgpu: Move VBIOS version to sysfs
Quoted 3 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>
Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Alex
Quoted 132 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct
amdgpu_device*adev); static voidamdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); static intamdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev); static intamdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev); -static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = { "TAHITI",drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +21
-4@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) { +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); } + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios * @@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r) DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves(adev); @@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0;}
-static int
amdgpu_debugfs_get_vbios_version(struct seq_file *m, void *data)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-15-struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev){ return amdgpu_debugfs_add_files(adev, amdgpu_vbios_dump_list, 1); }-static int
amdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device*adev) { @@ -3897,9 +3893,5 @@ static int
amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) { return 0;}
-static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) {} #endif
--
2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR1201MB0180C5182F56FF596C602553859B0-6iU6OBHu2P/H0AMcJMwsYmrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]
Quoted 11 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Russell, Kent
Sent: Friday, August 25, 2017 11:38 AM
To: Alex Deucher
Cc: amd-gfx list
Subject: RE: [PATCH] drm/amdgpu: Move VBIOS version to sysfsChristian was saying that the VBIOS binary should remain in debugfs (on the other thread). I'll let you two discuss, since I have zero vested interest in the location of the VBIOS binary :)
I don't have a strong preference either way.
Alex
Quoted 161 lines
Kent
-----Original Message-----
From: Alex Deucher [mailto:[email protected]]
Sent: Friday, August 25, 2017 10:41 AM
To: Russell, Kent
Cc: amd-gfx list
Subject: Re: [PATCH] drm/amdgpu: Move VBIOS version to sysfsQuoted 3 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Alex
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static uint32_t cail_ioreg_read(struct card_info
Quoted 21 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct
amdgpu_device*adev); static voidamdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); static intamdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev); static intamdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev); -static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = { "TAHITI",drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info*info,
uint32_treg)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +10
-0return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) { +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); } + +static DEVICE_ATTR(vbios_version, 0444,
amdgpu_atombios_get_vbios_version,drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_atombios_fini(struct
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+ NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios * @@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct
amdgpu_device*adev)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_atombios_init(struct
Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct
amdgpu_device*adev)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_device_init(struct amdgpu_device
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-0amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device*adev,
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4if (r) DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves(adev); @@ -3851,39 +3869,17Quoted 1 line
@@ static int amdgpu_debugfs_get_vbios_dump(struct
seq_file*m, void*data)
Quoted 17 lines
return 0;}
-static int
amdgpu_debugfs_get_vbios_version(struct seq_file *m, void *data)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-9-struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-60, NULL}, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; - static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device*adev)
Quoted 16 lines
{ return amdgpu_debugfs_add_files(adev, amdgpu_vbios_dump_list, 1); }-static int
amdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device*adev) { @@ -3897,9 +3893,5 @@ static int
amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) { return 0;}
-static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev){
Quoted 4 lines
} #endif
--
2.7.4
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 25.08.2017 um 16:41 schrieb Alex Deucher:
Quoted 6 lines · Kent Russell
Quoted 3 lines
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Yeah, but that is nothing a "normal" client application should be interested in.
Additional to that I'm still not sure if a large binary BIOS qualifies as single value per file.
Christian.
Quoted 134 lines
Alex
Quoted 131 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +23
-32@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = {"TAHITI" ,@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/** * amdgpu_atombios_fini - free the driver info and callbacks for atombios * @@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n" ); +return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)DRM_ERROR ("Creating vbios dump debugfs failed (%d).\n" , r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) -DRM_ERROR ("Creating vbios version debugfs failed (%d).\n" , r); -if ((amdgpu_testing &1 )) {if (adev->accel_working)amdgpu_test_moves (adev);@@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0; } -static int amdgpu_debugfs_get_vbios_version (struct seq_file *m,void *data) -{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {@@ -3897,9 +3893,5 @@ static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) {return 0 ; } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif --2.7.4
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): cf9249dc-5c0b-22ae-ec53-dbc4b9845d4b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Quoted 13 lines · Christian König
Am 25.08.2017 um 16:41 schrieb Alex Deucher:
Quoted 10 lines
Quoted 4 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Quoted 5 lines
Yeah, but that is nothing a "normal" client application should be interested in.
Additional to that I'm still not sure if a large binary BIOS qualifies as single value per file.
Well, you can read pci roms out of sysfs, so there is precedent. For our purposes, debugfs is fine.
Alex
Quoted 168 lines
Christian.
Quoted 161 lines
Alex
Quoted 149 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev);static const char *amdgpu_asic_name[] = { "TAHITI",drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +14
-0@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/**
*amdgpu_atombios_fini- free the driver info and callbacks for
atombios
*drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct amdgpu_device *adev) adev->mode_info.atom_context =NULL ;kfree (adev->mode_info.atom_card_info); adev->mode_info.atom_card_info =NULL ; +device_remove_file (adev->dev, &dev_attr_vbios_version); }/**
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev) {struct card_info *atom_card_info =kzalloc (sizeof (struct card_info ),GFP_KERNEL ); +int ret;if (!atom_card_info)return -ENOMEM;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-0@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_init (adev);amdgpu_atombios_allocate_fb_scratch (adev); } + + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { +DRM_ERROR ("Failed to create device file for VBIOS version\n"); +return ret; + } +return 0 ;}drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)DRM_ERROR ("Creating vbios dump debugfs failed (%d).\n" , r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) - DRM_ERROR("Creating vbios version debugfs failed (%d).\n", r); -if ((amdgpu_testing &1 )) {if (adev->accel_working) amdgpu_test_moves(adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-22@@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)return 0 ; } -static int amdgpu_debugfs_get_vbios_version (struct seq_file *m,void *data) -{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev) {drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4@@ -3897,9 +3893,5 @@ static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) {return 0 ; } -static int amdgpu_debugfs_vbios_version_init (struct amdgpu_device *adev) -{ -return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif
--
2.7.4Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_PBqKUsR2aT5UPZ5JPBHKEHqytN=7rzD5UONe9KKf0V-Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Would it be possible to get a Reviewed-By since we'll leave the VBIOS in debugfs for now? Thanks!
Kent
-----Original Message-----
From: Alex Deucher [mailto:[email protected]]
Sent: Friday, August 25, 2017 3:17 PM
To: Christian König
Cc: Russell, Kent; amd-gfx list
Subject: Re: [PATCH] drm/amdgpu: Move VBIOS version to sysfs
Quoted 13 lines · Christian König
Am 25.08.2017 um 16:41 schrieb Alex Deucher:
Quoted 10 lines
Quoted 4 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Quoted 5 lines
Yeah, but that is nothing a "normal" client application should be interested in.
Additional to that I'm still not sure if a large binary BIOS qualifies as single value per file.
Well, you can read pci roms out of sysfs, so there is precedent. For our purposes, debugfs is fine.
Alex
Quoted 173 lines
Christian.
Quoted 166 lines
Alex
Quoted 154 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init(struct
amdgpu_device*adev);static const char *amdgpu_asic_name[] = { "TAHITI",drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +14
-0@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg) return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct +device_attribute *attr, +char *buf) { +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/**
*amdgpu_atombios_fini- free the driver info and callbacks for
atombios
*drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct
amdgpu_device
*adev)adev->mode_info.atom_context = NULL; kfree(adev->mode_info.atom_card_info); adev->mode_info.atom_card_info = NULL;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct
amdgpu_device
*adev)
{
structcard_info*atom_card_info=
kzalloc(sizeof(struct card_info), GFP_KERNEL);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct
amdgpu_device
*adev)amdgpu_atombios_scratch_regs_init(adev); amdgpu_atombios_allocate_fb_scratch(adev); }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-0+ + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { + DRM_ERROR("Failed to create device file for VBIOSversion\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-4+return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r) DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) - DRM_ERROR("Creating vbios version debugfs failed (%d).\n", r); -if ((amdgpu_testing &1 )) {if (adev->accel_working) amdgpu_test_moves(adev); @@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0;}
-static int amdgpu_debugfs_get_vbios_version(struct
seq_file*m, void
*data)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-17-{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init(struct amdgpu_device*adev) -{
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list, 1); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {@@ -3897,9 +3893,5 @@ static intamdgpu_debugfs_vbios_dump_init(struct
amdgpu_device*adev){ return 0;}
-static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR1201MB0180A46EEBD258AFD3CE1CEB859E0-6iU6OBHu2P/H0AMcJMwsYmrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]
Christian König
Reviewed-byAm 28.08.2017 um 14:39 schrieb Russell, Kent:
Quoted 199 lines
Would it be possible to get a Reviewed-By since we'll leave the VBIOS in debugfs for now? Thanks!
Kent
-----Original Message-----
From: Alex Deucher [mailto:[email protected]]
Sent: Friday, August 25, 2017 3:17 PM
To: Christian König
Cc: Russell, Kent; amd-gfx list
Subject: Re: [PATCH] drm/amdgpu: Move VBIOS version to sysfsQuoted 6 lines · Christian König
Am 25.08.2017 um 16:41 schrieb Alex Deucher:
Quoted 5 lines
Quoted 3 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>Quoted 8 lines
Quoted 2 lines
Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Yeah, but that is nothing a "normal" client application should be interested in.
Additional to that I'm still not sure if a large binary BIOS qualifies as single value per file.
Well, you can read pci roms out of sysfs, so there is precedent. For our purposes, debugfs is fine.
Alex
Quoted 169 lines
Christian.
Quoted 164 lines
Alex
Quoted 154 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev);static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init(struct
amdgpu_device*adev);static const char *amdgpu_asic_name[] = { "TAHITI",drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +14
-0@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg) return r; } +static ssize_t amdgpu_atombios_get_vbios_version (struct device *dev, +struct +device_attribute *attr, +char *buf) { +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/**
*amdgpu_atombios_fini- free the driver info and callbacks for
atombios*drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct
amdgpu_device
*adev)adev->mode_info.atom_context = NULL; kfree(adev->mode_info.atom_card_info); adev->mode_info.atom_card_info = NULL;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct
amdgpu_device
*adev)
{
structcard_info*atom_card_info=
kzalloc(sizeof(struct card_info), GFP_KERNEL);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct
amdgpu_device
*adev)amdgpu_atombios_scratch_regs_init(adev); amdgpu_atombios_allocate_fb_scratch(adev); }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-0+ + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { + DRM_ERROR("Failed to create device file for VBIOSversion\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-4+return ret; + } +return 0 ; }@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r) DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) - DRM_ERROR("Creating vbios version debugfs failed (%d).\n", r); -if ((amdgpu_testing &1 )) {if (adev->accel_working) amdgpu_test_moves(adev); @@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0;}
-static int amdgpu_debugfs_get_vbios_version(struct
seq_file*m, void
*data)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-17-{ -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, }; -static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; -static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev) {return amdgpu_debugfs_add_files (adev, amdgpu_vbios_dump_list,1 ); } -static int amdgpu_debugfs_vbios_version_init(struct amdgpu_device*adev) -{
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list, 1); -}#else static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev) {@@ -3897,9 +3893,5 @@ static intamdgpu_debugfs_vbios_dump_init(struct
amdgpu_device*adev){ return 0;}
-static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return 0 ; -}static void amdgpu_debugfs_regs_cleanup (struct amdgpu_device *adev) { }#endif --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Russell, Kent
Sent: Monday, August 28, 2017 8:39 AM
To: Alex Deucher; Christian König
Cc: amd-gfx list
Subject: RE: [PATCH] drm/amdgpu: Move VBIOS version to sysfsWould it be possible to get a Reviewed-By since we'll leave the VBIOS in debugfs for now? Thanks!
Quoted 216 lines
Kent
-----Original Message-----
From: Alex Deucher [mailto:[email protected]]
Sent: Friday, August 25, 2017 3:17 PM
To: Christian König
Cc: Russell, Kent; amd-gfx list
Subject: Re: [PATCH] drm/amdgpu: Move VBIOS version to sysfsQuoted 13 lines · Christian König
Am 25.08.2017 um 16:41 schrieb Alex Deucher:
Quoted 10 lines
Quoted 4 lines · Kent Russell
sysfs is more stable, and doesn't require root to access
Signed-off-by Kent Russell <[email protected]>Might as well move the vbios binary itself to sysfs as well. It should be a stable interface :)
Quoted 5 lines
Yeah, but that is nothing a "normal" client application should be interested in.
Additional to that I'm still not sure if a large binary BIOS qualifies as single value per file.
Well, you can read pci roms out of sysfs, so there is precedent. For our purposes, debugfs is fine.
Alex
Quoted 12 lines
Christian.
Quoted 8 lines
Alex
Quoted 5 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-)Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_debugfs_regs_init(struct · line 68
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -67,7 +67,6 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device*adev);
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0static int amdgpu_debugfs_test_ib_ring_init (struct amdgpu_device *adev);static int amdgpu_debugfs_vbios_dump_init (struct amdgpu_device *adev); -static int amdgpu_debugfs_vbios_version_init(struct
amdgpu_device*adev);Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static uint32_t cail_ioreg_read(struct · line 893
Quoted 8 lines
static const char *amdgpu_asic_name[] = { "TAHITI",drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0@@ -890,6 +889,20 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg) return r; } +static ssize_t amdgpu_atombios_get_vbios_version(struct device*dev,
Quoted 56 lines
Quoted 56 lines
Quoted 56 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13
-0+struct +device_attribute *attr, + char *buf) { + struct drm_device *ddev = dev_get_drvdata(dev); +struct amdgpu_device *adev = ddev->dev_private; +struct atom_context *ctx = adev->mode_info.atom_context; + +return snprintf (buf,PAGE_SIZE ,"%s\n" , ctx->vbios_version); +} + +static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version, + NULL); +/**
*amdgpu_atombios_fini- free the driver info and callbacks for
atombios
*drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -909,6 +922,7 @@ static void amdgpu_atombios_fini(struct
amdgpu_device
*adev)adev->mode_info.atom_context = NULL; kfree(adev->mode_info.atom_card_info); adev->mode_info.atom_card_info = NULL;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+device_remove_file (adev->dev, &dev_attr_vbios_version); }/** @@ -925,6 +939,7 @@ static int amdgpu_atombios_init(struct
amdgpu_device
*adev)
{
structcard_info*atom_card_info=
kzalloc(sizeof(struct card_info), GFP_KERNEL);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-0+int ret;if (!atom_card_info)return -ENOMEM ;@@ -961,6 +976,13 @@ static int amdgpu_atombios_init(struct
amdgpu_device
*adev)amdgpu_atombios_scratch_regs_init(adev); amdgpu_atombios_allocate_fb_scratch(adev); }drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-0+ + ret =device_create_file (adev->dev, &dev_attr_vbios_version); +if (ret) { + DRM_ERROR("Failed to create device file for VBIOSversion\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0+return ret; + } +return 0 ; }Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_device_init(struct
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -2256,10 +2278,6 @@ int amdgpu_device_init(struct
amdgpu_device*adev,Quoted 37 lines
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-4if (r) DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r); - r =amdgpu_debugfs_vbios_version_init (adev); -if (r) - DRM_ERROR("Creating vbios version debugfs failed (%d).\n", r); -if ((amdgpu_testing &1 )) {if (adev->accel_working) amdgpu_test_moves(adev); @@ -3851,39 +3869,17 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) return 0;}
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Quoted 5 lines
-static int amdgpu_debugfs_get_vbios_version(struct
seq_file*m, void
*data)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-{ - struct drm_info_node *node = (struct drm_info_node *) m-private;
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-8-struct drm_device *dev = node->minor->dev; -struct amdgpu_device *adev = dev->dev_private; -struct atom_context *ctx = adev->mode_info.atom_context; - -seq_printf (m,"%s\n" , ctx->vbios_version); -return 0 ; -} -static const struct drm_info_list amdgpu_vbios_dump_list[] = { {"amdgpu_vbios" , amdgpu_debugfs_get_vbios_dump,0 ,NULL }, };Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-6-static const struct drm_info_list amdgpu_vbios_version_list[] = { - {"amdgpu_vbios_version" , - amdgpu_debugfs_get_vbios_version, -0 ,NULL }, -}; - static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device*adev)
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Quoted 11 lines
{ return amdgpu_debugfs_add_files(adev, amdgpu_vbios_dump_list, 1);}
-static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3-return amdgpu_debugfs_add_files (adev, - amdgpu_vbios_version_list,1 ); -}#else static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device*adev)
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -3897,9 +3893,5 @@ static intamdgpu_debugfs_vbios_dump_init(struct
amdgpu_device*adev)Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Quoted 8 lines
{ return 0;}
-static intamdgpu_debugfs_vbios_version_init(struct amdgpu_device *adev)-{drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-2-return 0 ; -} static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device*adev) { }
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
#endif
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfxQuoted 7 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx