132 lines
3.7 KiB
Diff
132 lines
3.7 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Subject: radeon, amdgpu: Firmware is required for DRM and KMS on R600 onward
|
|
Date: Tue, 08 Jan 2013 03:25:52 +0000
|
|
Bug-Debian: https://bugs.debian.org/607194
|
|
Bug-Debian: https://bugs.debian.org/607471
|
|
Bug-Debian: https://bugs.debian.org/610851
|
|
Bug-Debian: https://bugs.debian.org/627497
|
|
Bug-Debian: https://bugs.debian.org/632212
|
|
Bug-Debian: https://bugs.debian.org/637943
|
|
Bug-Debian: https://bugs.debian.org/649448
|
|
Bug-Debian: https://bugs.debian.org/697229
|
|
Forwarded: no
|
|
|
|
radeon requires firmware/microcode for the GPU in all chips, but for
|
|
newer chips (apparently R600 'Evergreen' onward) it also expects
|
|
firmware for the memory controller and other sub-blocks.
|
|
|
|
radeon attempts to gracefully fall back and disable some features if
|
|
the firmware is not available, but becomes unstable - the framebuffer
|
|
and/or system memory may be corrupted, or the display may stay black.
|
|
|
|
Therefore, perform a basic check for the existence of
|
|
/lib/firmware/{radeon,amdgpu} when a device is probed, and abort if it
|
|
is missing, except for the pre-R600 case.
|
|
|
|
---
|
|
--- a/drivers/gpu/drm/radeon/radeon_drv.c
|
|
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
|
|
@@ -43,6 +43,8 @@
|
|
#include <drm/drm_fb_helper.h>
|
|
|
|
#include <drm/drm_crtc_helper.h>
|
|
+#include <linux/namei.h>
|
|
+#include <linux/path.h>
|
|
|
|
/*
|
|
* KMS wrapper.
|
|
@@ -311,6 +313,28 @@ static struct drm_driver kms_driver;
|
|
|
|
bool radeon_device_is_virtual(void);
|
|
|
|
+/* Test that /lib/firmware/radeon is a directory (or symlink to a
|
|
+ * directory). We could try to match the udev search path, but let's
|
|
+ * keep it simple.
|
|
+ */
|
|
+static bool radeon_firmware_installed(void)
|
|
+{
|
|
+#if IS_BUILTIN(CONFIG_DRM_RADEON)
|
|
+ /* It may be too early to tell. Assume it's there. */
|
|
+ return true;
|
|
+#else
|
|
+ struct path path;
|
|
+
|
|
+ if (kern_path("/lib/firmware/radeon", LOOKUP_DIRECTORY | LOOKUP_FOLLOW,
|
|
+ &path) == 0) {
|
|
+ path_put(&path);
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+#endif
|
|
+}
|
|
+
|
|
static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
|
|
{
|
|
struct apertures_struct *ap;
|
|
@@ -340,6 +364,12 @@ static int radeon_pci_probe(struct pci_d
|
|
if (vga_switcheroo_client_probe_defer(pdev))
|
|
return -EPROBE_DEFER;
|
|
|
|
+ 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");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
/* Get rid of things like offb */
|
|
ret = radeon_kick_out_firmware_fb(pdev);
|
|
if (ret)
|
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
@@ -40,6 +40,8 @@
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/vga_switcheroo.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
+#include <linux/namei.h>
|
|
+#include <linux/path.h>
|
|
|
|
#include "amdgpu.h"
|
|
#include "amdgpu_irq.h"
|
|
@@ -545,6 +547,28 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
|
|
|
|
static struct drm_driver kms_driver;
|
|
|
|
+/* Test that /lib/firmware/amdgpu is a directory (or symlink to a
|
|
+ * directory). We could try to match the udev search path, but let's
|
|
+ * keep it simple.
|
|
+ */
|
|
+static bool amdgpu_firmware_installed(void)
|
|
+{
|
|
+#if IS_BUILTIN(CONFIG_DRM_AMDGPU)
|
|
+ /* It may be too early to tell. Assume it's there. */
|
|
+ return true;
|
|
+#else
|
|
+ struct path path;
|
|
+
|
|
+ if (kern_path("/lib/firmware/amdgpu", LOOKUP_DIRECTORY | LOOKUP_FOLLOW,
|
|
+ &path) == 0) {
|
|
+ path_put(&path);
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+#endif
|
|
+}
|
|
+
|
|
static int amdgpu_kick_out_firmware_fb(struct pci_dev *pdev)
|
|
{
|
|
struct apertures_struct *ap;
|
|
@@ -579,6 +603,11 @@ static int amdgpu_pci_probe(struct pci_d
|
|
return -ENODEV;
|
|
}
|
|
|
|
+ if (!amdgpu_firmware_installed()) {
|
|
+ DRM_ERROR("amdgpu requires firmware installed\n");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
/*
|
|
* Initialize amdkfd before starting radeon. If it was not loaded yet,
|
|
* defer radeon probing
|