From: jsg <jsg@openbsd.org>
Date: Mon, 27 Sep 2021 03:52:13 +0000 (+0000)
Subject: drm/amdgpu: Fix a printing message
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8a8b31b753cdd88a4385cfaacb76786d63f0e9df;p=openbsd

drm/amdgpu: Fix a printing message

From Oak Zeng
a5999d18a8d8c4c767c60d67fe6a6fe51b9a203d in linux 5.10.y/5.10.67
95f71f12aa45d65b7f2ccab95569795edffd379a in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
index 3de6e788545..5f800c325e3 100644
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
@@ -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);
diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
index c438970d6fa..6e0612003c0 100644
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_0.c
@@ -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);
diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
index 5698f0bf327..b0f7239f56b 100644
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v2_5.c
@@ -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);
diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v3_0.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v3_0.c
index f34223b993c..22ed46daa4c 100644
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v3_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v3_0.c
@@ -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);