59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Mon, 12 Mar 2018 01:14:03 +0000
|
|
Subject: firmware_class: Refer to Debian wiki page when logging missing firmware
|
|
Bug-Debian: https://bugs.debian.org/888405
|
|
Forwarded: not-needed
|
|
|
|
If firmware loading fails due to a missing file, log a second error
|
|
message referring to our wiki page about firmware. This will explain
|
|
why some firmware is in non-free, or can't be packaged at all. Only
|
|
do this once per boot.
|
|
|
|
Do something similar in the radeon and amdgpu drivers, where we have
|
|
an early check to avoid failing at a point where we cannot display
|
|
anything.
|
|
|
|
---
|
|
Index: linux/drivers/base/firmware_loader/main.c
|
|
===================================================================
|
|
--- linux.orig/drivers/base/firmware_loader/main.c
|
|
+++ linux/drivers/base/firmware_loader/main.c
|
|
@@ -340,9 +340,12 @@ fw_get_filesystem_firmware(struct device
|
|
}
|
|
__putname(path);
|
|
|
|
- if (rc)
|
|
+ if (rc) {
|
|
dev_err(device, "firmware: failed to load %s (%d)\n",
|
|
fw_priv->fw_name, rc);
|
|
+ if (rc == -ENOENT)
|
|
+ pr_err_once("See https://wiki.debian.org/Firmware for information about missing firmware\n");
|
|
+ }
|
|
|
|
return rc;
|
|
}
|
|
Index: linux/drivers/gpu/drm/radeon/radeon_drv.c
|
|
===================================================================
|
|
--- linux.orig/drivers/gpu/drm/radeon/radeon_drv.c
|
|
+++ linux/drivers/gpu/drm/radeon/radeon_drv.c
|
|
@@ -403,6 +403,7 @@ static int radeon_pci_probe(struct pci_d
|
|
if ((ent->driver_data & RADEON_FAMILY_MASK) >= CHIP_R600 &&
|
|
!radeon_firmware_installed()) {
|
|
DRM_ERROR("radeon kernel modesetting for R600 or later requires firmware installed\n");
|
|
+ pr_err_once("See https://wiki.debian.org/Firmware for information about missing firmware\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
Index: linux/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
===================================================================
|
|
--- linux.orig/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
+++ linux/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
@@ -859,6 +859,7 @@ static int amdgpu_pci_probe(struct pci_d
|
|
|
|
if (!amdgpu_firmware_installed()) {
|
|
DRM_ERROR("amdgpu requires firmware installed\n");
|
|
+ pr_err_once("See https://wiki.debian.org/Firmware for information about missing firmware\n");
|
|
return -ENODEV;
|
|
}
|
|
|