On Tue, Nov 12, 2024 at 9:31 AM Jesse.zhang@xxxxxxx <jesse.zhang@xxxxxxx> wrote:
>
> For multiple vcn instances, to avoid creating reset sysfs multiple times,
> add the instance paramter in reset mask init.
I think it would be better to create one sysfs file per instance. E.g.,
vcn_reset_mask, vcn1_reset_mask, vcn2_reset_mask, etc.
Alex
>
> Signed-off-by: Jesse Zhang <jesse.zhang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 10 ++++------
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 4 ++--
> 5 files changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 25f490ad3a85..1d4eda649845 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -1295,11 +1295,11 @@ static ssize_t amdgpu_get_vcn_reset_mask(struct device *dev,
> static DEVICE_ATTR(vcn_reset_mask, 0444,
> amdgpu_get_vcn_reset_mask, NULL);
>
> -int amdgpu_vcn_sysfs_reset_mask_init(struct amdgpu_device *adev)
> +int amdgpu_vcn_sysfs_reset_mask_init(struct amdgpu_device *adev, int inst)
> {
> int r = 0;
>
> - if (adev->vcn.num_vcn_inst) {
> + if (inst == 0) {
> r = device_create_file(adev->dev, &dev_attr_vcn_reset_mask);
> if (r)
> return r;
> @@ -1308,12 +1308,12 @@ int amdgpu_vcn_sysfs_reset_mask_init(struct amdgpu_device *adev)
> return r;
> }
>
> -void amdgpu_vcn_sysfs_reset_mask_fini(struct amdgpu_device *adev)
> +void amdgpu_vcn_sysfs_reset_mask_fini(struct amdgpu_device *adev, int inst)
> {
> int idx;
>
> if (drm_dev_enter(adev_to_drm(adev), &idx)) {
> - if (adev->vcn.num_vcn_inst)
> + if (inst == 0)
> device_remove_file(adev->dev, &dev_attr_vcn_reset_mask);
> drm_dev_exit(idx);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index 7ff4ae2a0432..9b10044c61a3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -519,7 +519,7 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
> int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx,
> enum AMDGPU_UCODE_ID ucode_id);
> int amdgpu_vcn_save_vcpu_bo(struct amdgpu_device *adev, int inst);
> -int amdgpu_vcn_sysfs_reset_mask_init(struct amdgpu_device *adev);
> -void amdgpu_vcn_sysfs_reset_mask_fini(struct amdgpu_device *adev);
> +int amdgpu_vcn_sysfs_reset_mask_init(struct amdgpu_device *adev, int inst);
> +void amdgpu_vcn_sysfs_reset_mask_fini(struct amdgpu_device *adev, int inst);
>
> #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index 59f83409d323..109b27904984 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -250,11 +250,9 @@ static int vcn_v4_0_sw_init(struct amdgpu_ip_block *ip_block)
> ip_block->ip_dump = ptr;
> }
>
> - if (inst == 0) {
> - r = amdgpu_vcn_sysfs_reset_mask_init(adev);
> - if (r)
> - return r;
> - }
> + r = amdgpu_vcn_sysfs_reset_mask_init(adev, inst);
> + if (r)
> + return r;
>
> return 0;
> }
> @@ -292,7 +290,7 @@ static int vcn_v4_0_sw_fini(struct amdgpu_ip_block *ip_block)
> if (r)
> return r;
>
> - amdgpu_vcn_sysfs_reset_mask_fini(adev);
> + amdgpu_vcn_sysfs_reset_mask_fini(adev, inst);
> r = amdgpu_vcn_sw_fini(adev, inst);
>
> kfree(ip_block->ip_dump);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> index e9b869f373c9..ef3dfd44a022 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> @@ -217,7 +217,7 @@ static int vcn_v4_0_3_sw_init(struct amdgpu_ip_block *ip_block)
> ip_block->ip_dump = ptr;
> }
>
> - r = amdgpu_vcn_sysfs_reset_mask_init(adev);
> + r = amdgpu_vcn_sysfs_reset_mask_init(adev, inst);
> if (r)
> return r;
>
> @@ -254,7 +254,7 @@ static int vcn_v4_0_3_sw_fini(struct amdgpu_ip_block *ip_block)
> if (r)
> return r;
>
> - amdgpu_vcn_sysfs_reset_mask_fini(adev);
> + amdgpu_vcn_sysfs_reset_mask_fini(adev, inst);
> r = amdgpu_vcn_sw_fini(adev, inst);
>
> kfree(ip_block->ip_dump);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> index 96ec01cffea3..8f9c19c68d88 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> @@ -186,7 +186,7 @@ static int vcn_v5_0_0_sw_init(struct amdgpu_ip_block *ip_block)
> ip_block->ip_dump = ptr;
> }
>
> - r = amdgpu_vcn_sysfs_reset_mask_init(adev);
> + r = amdgpu_vcn_sysfs_reset_mask_init(adev, inst);
> if (r)
> return r;
>
> @@ -223,7 +223,7 @@ static int vcn_v5_0_0_sw_fini(struct amdgpu_ip_block *ip_block)
> if (r)
> return r;
>
> - amdgpu_vcn_sysfs_reset_mask_fini(adev);
> + amdgpu_vcn_sysfs_reset_mask_fini(adev, inst);
> r = amdgpu_vcn_sw_fini(adev, inst);
>
> kfree(ip_block->ip_dump);
> --
> 2.25.1
>
