From: Hawking Zhang Date: Fri, 21 Aug 2020 14:12:50 +0000 (+0800) Subject: drm/amdgpu: comments out vcn/jpeg ip blocks for aldebaran X-Git-Tag: v5.13-rc1~123^2~12^2~229 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf7821a84a4c6c54e62b142c0da64b2189736c52;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: comments out vcn/jpeg ip blocks for aldebaran vcn fw front door loading is not functional. comments out vcn/jpeg ip blocks so people can load amdgpu driver without specify ip_mask module parameter. Signed-off-by: Hawking Zhang Reviewed-by: Kevin Wang Reviewed-by: James Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 6b1b2b379226b..767a3d5302378 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -1079,8 +1079,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block); amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block); - amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block); - amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block); + /*amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block); + amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block);*/ break; default: return -EINVAL;