diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | 0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch | 77 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
3 files changed, 96 insertions, 11 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-libre - pkgver = 4.1.4_gnu + pkgver = 4.1.5_gnu pkgrel = 1 url = http://linux-libre.fsfla.org/ arch = i686 @@ -13,8 +13,8 @@ pkgbase = linux-libre options = !strip source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.1-gnu/linux-libre-4.1-gnu.tar.xz source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.1-gnu/linux-libre-4.1-gnu.tar.xz.sign - source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.1.4-gnu/patch-4.1-gnu-4.1.4-gnu.xz - source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.1.4-gnu/patch-4.1-gnu-4.1.4-gnu.xz.sign + source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.1.5-gnu/patch-4.1-gnu-4.1.5-gnu.xz + source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.1.5-gnu/patch-4.1-gnu-4.1.5-gnu.xz.sign source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm @@ -25,9 +25,10 @@ pkgbase = linux-libre source = config.x86_64 source = linux.preset source = change-default-console-loglevel.patch + source = 0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch sha256sums = 48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324 sha256sums = SKIP - sha256sums = 4929cf8776f454ec34af5e1d89fa0ceda666da17e5d0878f7c9f6db5e0e1af97 + sha256sums = 2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3 sha256sums = SKIP sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494 sha256sums = SKIP @@ -39,6 +40,7 @@ pkgbase = linux-libre sha256sums = ac457bf24c83a4af82251a67cb3de06f0b73e66bd08c2fb1eb936caa3b555c6f sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 + sha256sums = 38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d pkgname = linux-libre pkgdesc = The Linux-libre kernel and modules @@ -48,7 +50,7 @@ pkgname = linux-libre depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = linux=4.1.4 + provides = linux=4.1.5 conflicts = kernel26 conflicts = kernel26-libre conflicts = linux-libre-kmod-alx @@ -60,7 +62,7 @@ pkgname = linux-libre pkgname = linux-libre-headers pkgdesc = Header files and scripts for building modules for Linux-libre kernel - provides = linux-headers=4.1.4 + provides = linux-headers=4.1.5 conflicts = kernel26-headers conflicts = kernel26-libre-headers replaces = linux-headers @@ -69,7 +71,7 @@ pkgname = linux-libre-headers pkgname = linux-libre-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel - provides = linux-docs=4.1.4 + provides = linux-docs=4.1.5 conflicts = kernel26-docs conflicts = kernel26-libre-docs replaces = linux-docs diff --git a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000000..15da9c081da8 --- /dev/null +++ b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch @@ -0,0 +1,77 @@ +From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001 +From: Jason Self <j@jxself.org> +Date: Wed, 5 Aug 2015 09:16:03 -0700 +Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the + firmwares. + +--- + drivers/gpu/drm/radeon/r600.c | 8 ++++---- + drivers/gpu/drm/radeon/r600_cp.c | 5 ++++- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 720e599..d6a92ba 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) + } + + DRM_INFO("Loading %s Microcode\n", chip_name); +- ++#if 0 + snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); + err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); + if (err) +@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) + err = -EINVAL; + } + } +- ++#endif + out: + if (err) { + if (err != -EINVAL) +@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) + r = radeon_bo_init(rdev); + if (r) + return r; +- ++#if 0 + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + r = r600_init_microcode(rdev); + if (r) { +@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) + return r; + } + } +- ++#endif + /* Initialize power management */ + radeon_pm_init(rdev); + +diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c +index af15260..f138df9 100644 +--- a/drivers/gpu/drm/radeon/r600_cp.c ++++ b/drivers/gpu/drm/radeon/r600_cp.c +@@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + else + r600_vm_init(dev); + } +- ++#if 0 + if (!dev_priv->me_fw || !dev_priv->pfp_fw) { + int err = r600_cp_init_microcode(dev_priv); + if (err) { +@@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + return err; + } + } ++#endif ++ printk("Skipping firmware loading\n"); ++#endif + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_cp_load_microcode(dev_priv); + else +-- +1.9.1 + @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.1-gnu -_pkgver=4.1.4-gnu +_pkgver=4.1.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -39,10 +39,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '4929cf8776f454ec34af5e1d89fa0ceda666da17e5d0878f7c9f6db5e0e1af97' + '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -53,7 +54,8 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' '7ec6927f4a4bc8e1aa50adfcce868f04b07b0de19a54554a8ad27ee0341b4b45' 'ac457bf24c83a4af82251a67cb3de06f0b73e66bd08c2fb1eb936caa3b555c6f' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -88,6 +90,10 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # Make the radeon driver load without the firmwares + # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html + patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch + cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion |