Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: Add sysfs interface for vpe reset mask

Add the sysfs interface for vpe:
vpe_reset_mask

The interface is read-only and show the resets supported by the IP.
For example, full adapter reset (mode1/mode2/BACO/etc),
soft reset, queue reset, and pipe reset.

V2: the sysfs node returns a text string instead of some flags (Christian)
v3: add a generic helper which takes the ring as parameter
and print the strings in the order they are applied (Christian)

check amdgpu_gpu_recovery before creating sysfs file itself,
and initialize supported_reset_types in IP version files (Lijo)

Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Suggested-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Tim Huang <tim.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Jesse.zhang@amd.com and committed by
Alex Deucher
ea02ea94 59fd50b8

+46
+43
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
··· 377 377 ret = vpe_init_microcode(vpe); 378 378 if (ret) 379 379 goto out; 380 + 381 + /* TODO: Add queue reset mask when FW fully supports it */ 382 + adev->vpe.supported_reset = 383 + amdgpu_get_soft_full_reset_mask(&adev->vpe.ring); 384 + ret = amdgpu_vpe_sysfs_reset_mask_init(adev); 385 + if (ret) 386 + goto out; 380 387 out: 381 388 return ret; 382 389 } ··· 396 389 release_firmware(vpe->fw); 397 390 vpe->fw = NULL; 398 391 392 + amdgpu_vpe_sysfs_reset_mask_fini(adev); 399 393 vpe_ring_fini(vpe); 400 394 401 395 amdgpu_bo_free_kernel(&adev->vpe.cmdbuf_obj, ··· 871 863 struct amdgpu_device *adev = ring->adev; 872 864 873 865 schedule_delayed_work(&adev->vpe.idle_work, VPE_IDLE_TIMEOUT); 866 + } 867 + 868 + static ssize_t amdgpu_get_vpe_reset_mask(struct device *dev, 869 + struct device_attribute *attr, 870 + char *buf) 871 + { 872 + struct drm_device *ddev = dev_get_drvdata(dev); 873 + struct amdgpu_device *adev = drm_to_adev(ddev); 874 + 875 + if (!adev) 876 + return -ENODEV; 877 + 878 + return amdgpu_show_reset_mask(buf, adev->vpe.supported_reset); 879 + } 880 + 881 + static DEVICE_ATTR(vpe_reset_mask, 0444, 882 + amdgpu_get_vpe_reset_mask, NULL); 883 + 884 + int amdgpu_vpe_sysfs_reset_mask_init(struct amdgpu_device *adev) 885 + { 886 + int r = 0; 887 + 888 + if (adev->vpe.num_instances) { 889 + r = device_create_file(adev->dev, &dev_attr_vpe_reset_mask); 890 + if (r) 891 + return r; 892 + } 893 + 894 + return r; 895 + } 896 + 897 + void amdgpu_vpe_sysfs_reset_mask_fini(struct amdgpu_device *adev) 898 + { 899 + if (adev->vpe.num_instances) 900 + device_remove_file(adev->dev, &dev_attr_vpe_reset_mask); 874 901 } 875 902 876 903 static const struct amdgpu_ring_funcs vpe_ring_funcs = {
+3
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h
··· 79 79 80 80 uint32_t num_instances; 81 81 bool collaborate_mode; 82 + uint32_t supported_reset; 82 83 }; 83 84 84 85 int amdgpu_vpe_psp_update_sram(struct amdgpu_device *adev); ··· 87 86 int amdgpu_vpe_ring_init(struct amdgpu_vpe *vpe); 88 87 int amdgpu_vpe_ring_fini(struct amdgpu_vpe *vpe); 89 88 int amdgpu_vpe_configure_dpm(struct amdgpu_vpe *vpe); 89 + void amdgpu_vpe_sysfs_reset_mask_fini(struct amdgpu_device *adev); 90 + int amdgpu_vpe_sysfs_reset_mask_init(struct amdgpu_device *adev); 90 91 91 92 #define vpe_ring_init(vpe) ((vpe)->funcs->ring_init ? (vpe)->funcs->ring_init((vpe)) : 0) 92 93 #define vpe_ring_start(vpe) ((vpe)->funcs->ring_start ? (vpe)->funcs->ring_start((vpe)) : 0)