Commit 52215e2a authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Use `amdgpu_ucode_*` helpers for VCE 



The `amdgpu_ucode_request` helper will ensure that the return code for
missing firmware is -ENODEV so that early_init can fail.

The `amdgpu_ucode_release` helper is for symmetry on unloading.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b406477c

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

+3 −11
Original line number Diff line number Diff line
@@ -158,19 +158,11 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) 
		return -EINVAL;

	}



	r = request_firmware(&adev->vce.fw, fw_name, adev->dev);

	if (r) {

		dev_err(adev->dev, "amdgpu_vce: Can't load firmware \"%s\"\n",

			fw_name);

		return r;

	}



	r = amdgpu_ucode_validate(adev->vce.fw);

	r = amdgpu_ucode_request(adev, &adev->vce.fw, fw_name);

	if (r) {

		dev_err(adev->dev, "amdgpu_vce: Can't validate firmware \"%s\"\n",

			fw_name);

		release_firmware(adev->vce.fw);

		adev->vce.fw = NULL;

		amdgpu_ucode_release(&adev->vce.fw);

		return r;

	}
@@ -228,7 +220,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev) 
	for (i = 0; i < adev->vce.num_rings; i++)

		amdgpu_ring_fini(&adev->vce.ring[i]);



	release_firmware(adev->vce.fw);

	amdgpu_ucode_release(&adev->vce.fw);

	mutex_destroy(&adev->vce.idle_mutex);



	return 0;