[Glibc-bsd-commits] r5407 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/patches kfreebsd-11/debian kfreebsd-11/debian/patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-03 18:27:25 +0000 (Mon, 03 Feb 2014)
New Revision: 5407

Added:
   trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff
   trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/series
Log:
radeonkms: Disable R600+ drivers when no firmware blob is available.  (Closes: #732692)

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2014-02-03 17:57:22 UTC (rev 5406)
+++ trunk/kfreebsd-10/debian/changelog	2014-02-03 18:27:25 UTC (rev 5407)
@@ -1,6 +1,8 @@
 kfreebsd-10 (10.0-2) UNRELEASED; urgency=low
 
   * Accept O_CLOEXEC in shm_open().
+  * radeonkms: Disable R600+ drivers when no firmware blob is available.
+    (Closes: #732692)
 
  -- Robert Millan <rmh at debian.org>  Fri, 24 Jan 2014 22:32:32 +0100
 

Added: trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff	2014-02-03 18:27:25 UTC (rev 5407)
@@ -0,0 +1,35 @@
+
+This is an attempt at an equivalent, portable version of:
+
+http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch?revision=20909&view=co
+
+--- a/sys/dev/drm2/radeon/r600.c
++++ b/sys/dev/drm2/radeon/r600.c
+@@ -3012,6 +3012,12 @@
+ 		rdev->accel_working = false;
+ 	}
+ 
++	/* Don't start up if the ucode is missing. */
++	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
++		DRM_ERROR("radeon: ucode required for R600+.\n");
++		return -EINVAL;
++	}
++
+ 	return 0;
+ }
+ 
+--- a/sys/dev/drm2/radeon/rv770.c
++++ b/sys/dev/drm2/radeon/rv770.c
+@@ -1186,6 +1186,12 @@
+ 		rdev->accel_working = false;
+ 	}
+ 
++	/* Don't start up if the ucode is missing. */
++	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
++		DRM_ERROR("radeon: ucode required for R600+.\n");
++		return -EINVAL;
++	}
++
+ 	return 0;
+ }
+ 

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2014-02-03 17:57:22 UTC (rev 5406)
+++ trunk/kfreebsd-10/debian/patches/series	2014-02-03 18:27:25 UTC (rev 5407)
@@ -3,6 +3,7 @@
 accept_O_CLOEXEC_in_shm_open.diff
 
 # Patches that are in good shape for merging upstream
+radeonkms_abort_nofw.diff
 mount_remount.diff
 
 # Other patches that might or might not be mergeable

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-02-03 17:57:22 UTC (rev 5406)
+++ trunk/kfreebsd-11/debian/changelog	2014-02-03 18:27:25 UTC (rev 5407)
@@ -2,6 +2,8 @@
 
   * B-D on libdwarf-freebsd-3 >= 10.0-2 (older versions break ctfconvert
     on i386-linux-gnu).
+  * radeonkms: Disable R600+ drivers when no firmware blob is available.
+    (Closes: #732692)
 
  -- Robert Millan <rmh at debian.org>  Sun, 26 Jan 2014 17:46:34 +0100
 

Added: trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff	                        (rev 0)
+++ trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff	2014-02-03 18:27:25 UTC (rev 5407)
@@ -0,0 +1,35 @@
+
+This is an attempt at an equivalent, portable version of:
+
+http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch?revision=20909&view=co
+
+--- a/sys/dev/drm2/radeon/r600.c
++++ b/sys/dev/drm2/radeon/r600.c
+@@ -3012,6 +3012,12 @@
+ 		rdev->accel_working = false;
+ 	}
+ 
++	/* Don't start up if the ucode is missing. */
++	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
++		DRM_ERROR("radeon: ucode required for R600+.\n");
++		return -EINVAL;
++	}
++
+ 	return 0;
+ }
+ 
+--- a/sys/dev/drm2/radeon/rv770.c
++++ b/sys/dev/drm2/radeon/rv770.c
+@@ -1186,6 +1186,12 @@
+ 		rdev->accel_working = false;
+ 	}
+ 
++	/* Don't start up if the ucode is missing. */
++	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
++		DRM_ERROR("radeon: ucode required for R600+.\n");
++		return -EINVAL;
++	}
++
+ 	return 0;
+ }
+ 

Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series	2014-02-03 17:57:22 UTC (rev 5406)
+++ trunk/kfreebsd-11/debian/patches/series	2014-02-03 18:27:25 UTC (rev 5407)
@@ -2,6 +2,7 @@
 xboxfb_ftbfs.diff
 
 # Patches that are in good shape for merging upstream
+radeonkms_abort_nofw.diff
 mount_remount.diff
 ldscript_output_format.diff
 unescaped_kern_ident.diff