drm/amdgpu: Fix a printing message
authorjsg <jsg@openbsd.org>
Mon, 27 Sep 2021 03:52:13 +0000 (03:52 +0000)
committerjsg <jsg@openbsd.org>
Mon, 27 Sep 2021 03:52:13 +0000 (03:52 +0000)
From Oak Zeng
a5999d18a8d8c4c767c60d67fe6a6fe51b9a203d in linux 5.10.y/5.10.67
95f71f12aa45d65b7f2ccab95569795edffd379a in mainline linux

sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
sys/dev/pci/drm/amd/amdgpu/vcn_v3_0.c

index 3de6e78..5f800c3 100644 (file)
@@ -126,7 +126,7 @@ static int vcn_v1_0_sw_init(void *handle)
                adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
                adev->firmware.fw_size +=
                        roundup2(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-               DRM_INFO("PSP loading VCN firmware\n");
+               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
        }
 
        r = amdgpu_vcn_resume(adev);
index c438970..6e06120 100644 (file)
@@ -122,7 +122,7 @@ static int vcn_v2_0_sw_init(void *handle)
                adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
                adev->firmware.fw_size +=
                        roundup2(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-               DRM_INFO("PSP loading VCN firmware\n");
+               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
        }
 
        r = amdgpu_vcn_resume(adev);
index 5698f0b..b0f7239 100644 (file)
@@ -152,7 +152,7 @@ static int vcn_v2_5_sw_init(void *handle)
                        adev->firmware.fw_size +=
                                roundup2(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
                }
-               DRM_INFO("PSP loading VCN firmware\n");
+               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
        }
 
        r = amdgpu_vcn_resume(adev);
index f34223b..22ed46d 100644 (file)
@@ -148,7 +148,7 @@ static int vcn_v3_0_sw_init(void *handle)
                        adev->firmware.fw_size +=
                                roundup2(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
                }
-               DRM_INFO("PSP loading VCN firmware\n");
+               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
        }
 
        r = amdgpu_vcn_resume(adev);