ACK: [PATCH][F/Unstable] UBUNTU: SAUCE: drm/amdgpu: Remove unreleased arcturus and navi12 firmware from modinfo

[Colin Ian King]

On 15/05/2020 15:26, Seth Forshee wrote:
> BugLink: https://bugs.launchpad.net/bugs/1873325
> 
> amdgpu contains references to unrelease firmware files in
> modinfo, causing warnings about missing firmware files from
> update-initramfs. Since the files are not available, all we can
> do is remove the MODULE_FIRMWARE declarations for these firmware
> files.
> 
> Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c   | 2 --
>  drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 2 --
>  2 files changed, 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 3199e4a5ff12..ca5f842f0873 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -55,11 +55,9 @@
>  MODULE_FIRMWARE(FIRMWARE_RAVEN);
>  MODULE_FIRMWARE(FIRMWARE_PICASSO);
>  MODULE_FIRMWARE(FIRMWARE_RAVEN2);
> -MODULE_FIRMWARE(FIRMWARE_ARCTURUS);
>  MODULE_FIRMWARE(FIRMWARE_RENOIR);
>  MODULE_FIRMWARE(FIRMWARE_NAVI10);
>  MODULE_FIRMWARE(FIRMWARE_NAVI14);
> -MODULE_FIRMWARE(FIRMWARE_NAVI12);
>  
>  static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
>  
> diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> index 0922d9cd858a..92d1f88186f8 100644
> --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> @@ -46,10 +46,8 @@
>  #include "asic_reg/smuio/smuio_11_0_0_sh_mask.h"
>  
>  MODULE_FIRMWARE("amdgpu/vega20_smc.bin");
> -MODULE_FIRMWARE("amdgpu/arcturus_smc.bin");
>  MODULE_FIRMWARE("amdgpu/navi10_smc.bin");
>  MODULE_FIRMWARE("amdgpu/navi14_smc.bin");
> -MODULE_FIRMWARE("amdgpu/navi12_smc.bin");
>  
>  #define SMU11_VOLTAGE_SCALE 4
>  
> 
Good idea.

Acked-by: Colin Ian King <colin.king at canonical.com>