Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8d090b7 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: allocate ip_block_enabled memory in common code 



Remove duplication across asic families and make it symmetric
with the freeing of the code in amdgpu_device.c

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a08c1d51

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

+3 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,9 @@ static int amdgpu_early_init(struct amdgpu_device *adev) 
		return -EINVAL;

	}





	adev->ip_block_enabled = kcalloc(adev->num_ip_blocks, sizeof(bool), GFP_KERNEL);

	if (adev->ip_block_enabled == NULL)

		return -ENOMEM;



	if (adev->ip_blocks == NULL) {

		DRM_ERROR("No IP blocks found!\n");

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

+0 −4
Original line number Diff line number Diff line
@@ -2256,10 +2256,6 @@ int cik_set_ip_blocks(struct amdgpu_device *adev) 
		return -EINVAL;

	}



	adev->ip_block_enabled = kcalloc(adev->num_ip_blocks, sizeof(bool), GFP_KERNEL);

	if (adev->ip_block_enabled == NULL)

		return -ENOMEM;



	return 0;

}

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

+0 −4
Original line number Diff line number Diff line
@@ -1189,10 +1189,6 @@ int vi_set_ip_blocks(struct amdgpu_device *adev) 
		return -EINVAL;

	}



	adev->ip_block_enabled = kcalloc(adev->num_ip_blocks, sizeof(bool), GFP_KERNEL);

	if (adev->ip_block_enabled == NULL)

		return -ENOMEM;



	return 0;

}