From fb4e65efe19d1974fb2f2ef502c7304e65208aa4 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Wed, 11 Nov 2020 07:18:36 +1100 Subject: [PATCH] [amd] navi10: print the actual device model --- src/amd/navi10.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/amd/navi10.c b/src/amd/navi10.c index c201316..1bf747e 100644 --- a/src/amd/navi10.c +++ b/src/amd/navi10.c @@ -32,10 +32,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include "psp_gfx_if.h" #include "nv.h" -#define log_prefix "Navi10/12/14: " -#define nv_info(fmt, arg...) pci_info(dev->pdev, log_prefix fmt, ##arg) -#define nv_warn(fmt, arg...) pci_warn(dev->pdev, log_prefix fmt, ##arg) -#define nv_err(fmt, arg...) pci_err(dev->pdev, log_prefix fmt, ##arg) +static const char * log_prefix; +#define nv_info(fmt, arg...) pci_info(dev->pdev, "%s " fmt, log_prefix, ##arg) +#define nv_warn(fmt, arg...) pci_warn(dev->pdev, "%s " fmt, log_prefix, ##arg) +#define nv_err(fmt, arg...) pci_err(dev->pdev, "%s " fmt, log_prefix, ##arg) extern bool amdgpu_get_bios(struct amd_fake_dev *adev); @@ -51,6 +51,16 @@ static int amd_navi10_reset(struct vendor_reset_dev *dev) if (ret) return ret; + switch (dev->info) + { + case AMD_NAVI10: log_prefix = "navi10"; break; + case AMD_NAVI12: log_prefix = "navi12"; break; + case AMD_NAVI14: log_prefix = "navi14"; break; + default: + pci_err(dev->pdev, "Unknown Navi type device: [%04x:%04x]\n", dev->pdev->vendor, dev->pdev->device); + return -ENOTSUPP; + } + ret = amdgpu_discovery_reg_base_init(adev); if (ret < 0) { @@ -67,7 +77,7 @@ static int amd_navi10_reset(struct vendor_reset_dev *dev) navi14_reg_base_init(adev); break; default: - pci_err(dev->pdev, "Unknown Navi type device: [%04x:%04x]\n", dev->pdev->vendor, dev->pdev->device); + /* should never happen */ return -ENOTSUPP; } }