diff options
Diffstat (limited to 'kernels/linux-libre-grsec-knock')
3 files changed, 91 insertions, 7 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000..15da9c081 --- /dev/null +++ b/kernels/linux-libre-grsec-knock/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 + diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index 644f32664..ae151f5e6 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-grsec-knock _pkgbasever=4.1-gnu -_pkgver=4.1.4-gnu +_pkgver=4.1.5-gnu _grsecver=3.1 -_timestamp=201508032312 +_timestamp=201508102129 _knockpatchver=4.1_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -47,12 +47,13 @@ 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' - 'd16f9699b0cf59f8ef73cb444468a6d8d8344024c86a1e6896585caa8cb8a2bb' + 'edf25146df39686581c63b91c80e83dc4568bd50ce4d91ca73cfd00cf9e1528d' 'SKIP' 'da336d8e5291b7641598eb5d7f44f54dacf6515ed6ffd32735dd6f128458dbdc' 'SKIP' @@ -63,9 +64,10 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' '64e0183ac31a3947144055cb0f180111f3871e89f7d0d59eecf064a366cd044c' - 'c4f567a784a62fc5c88e2900f029b87aa8e9160d9413f3a8376614fa99630789' + '3a1cef2c97f3646ac7dce8a5d43f85be004bcec7aa25e57ebd240cfe9c88c6ef' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva @@ -109,6 +111,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 diff --git a/kernels/linux-libre-grsec-knock/config.x86_64 b/kernels/linux-libre-grsec-knock/config.x86_64 index 69907daec..cb1d67450 100644 --- a/kernels/linux-libre-grsec-knock/config.x86_64 +++ b/kernels/linux-libre-grsec-knock/config.x86_64 @@ -6124,6 +6124,7 @@ CONFIG_KXCJK1013=m # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set # CONFIG_AD799X is not set +# CONFIG_CC10001_ADC is not set # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set # CONFIG_MCP320X is not set |