From: Greg Kroah-Hartman Date: Mon, 16 Mar 2015 13:08:58 +0000 (+0100) Subject: 3.14-stable patches X-Git-Tag: v3.10.72~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=868ca8c38207d8f7192f7627dc7ede34e8667d61;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: acpi-video-load-the-module-even-if-acpi-is-disabled.patch drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch drm-radeon-use-drm_mode_vrefresh-rather-than-mode-vrefresh.patch efi-small-leak-on-error-in-runtime-map-code.patch --- diff --git a/queue-3.14/acpi-video-load-the-module-even-if-acpi-is-disabled.patch b/queue-3.14/acpi-video-load-the-module-even-if-acpi-is-disabled.patch new file mode 100644 index 00000000000..81cdbc9450c --- /dev/null +++ b/queue-3.14/acpi-video-load-the-module-even-if-acpi-is-disabled.patch @@ -0,0 +1,48 @@ +From 6e17cb12881ba8d5e456b89f072dc6b70048af36 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Sun, 1 Mar 2015 10:41:37 +0000 +Subject: ACPI / video: Load the module even if ACPI is disabled + +From: Chris Wilson + +commit 6e17cb12881ba8d5e456b89f072dc6b70048af36 upstream. + +i915.ko depends upon the acpi/video.ko module and so refuses to load if +ACPI is disabled at runtime if for example the BIOS is broken beyond +repair. acpi/video provides an optional service for i915.ko and so we +should just allow the modules to load, but do no nothing in order to let +the machines boot correctly. + +Reported-by: Bill Augur +Signed-off-by: Chris Wilson +Cc: Daniel Vetter +Cc: Jani Nikula +Acked-by: Aaron Lu +[ rjw: Fixed up the new comment in acpi_video_init() ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/drivers/acpi/video.c ++++ b/drivers/acpi/video.c +@@ -2064,6 +2064,17 @@ EXPORT_SYMBOL(acpi_video_unregister); + + static int __init acpi_video_init(void) + { ++ /* ++ * Let the module load even if ACPI is disabled (e.g. due to ++ * a broken BIOS) so that i915.ko can still be loaded on such ++ * old systems without an AcpiOpRegion. ++ * ++ * acpi_video_register() will report -ENODEV later as well due ++ * to acpi_disabled when i915.ko tries to register itself afterwards. ++ */ ++ if (acpi_disabled) ++ return 0; ++ + dmi_check_system(video_dmi_table); + + if (intel_opregion_present()) diff --git a/queue-3.14/drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch b/queue-3.14/drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch new file mode 100644 index 00000000000..ee8c4acc2b8 --- /dev/null +++ b/queue-3.14/drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch @@ -0,0 +1,38 @@ +From dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Thu, 19 Feb 2015 16:02:15 -0500 +Subject: drm/radeon: fix 1 RB harvest config setup for TN/RL + +From: Alex Deucher + +commit dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e upstream. + +The logic was reversed from what the hw actually exposed. +Fixes graphics corruption in certain harvest configurations. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/ni.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/radeon/ni.c ++++ b/drivers/gpu/drm/radeon/ni.c +@@ -1073,12 +1073,12 @@ static void cayman_gpu_init(struct radeo + + if ((rdev->config.cayman.max_backends_per_se == 1) && + (rdev->flags & RADEON_IS_IGP)) { +- if ((disabled_rb_mask & 3) == 1) { +- /* RB0 disabled, RB1 enabled */ +- tmp = 0x11111111; +- } else { ++ if ((disabled_rb_mask & 3) == 2) { + /* RB1 disabled, RB0 enabled */ + tmp = 0x00000000; ++ } else { ++ /* RB0 disabled, RB1 enabled */ ++ tmp = 0x11111111; + } + } else { + tmp = gb_addr_config & NUM_PIPES_MASK; diff --git a/queue-3.14/drm-radeon-use-drm_mode_vrefresh-rather-than-mode-vrefresh.patch b/queue-3.14/drm-radeon-use-drm_mode_vrefresh-rather-than-mode-vrefresh.patch new file mode 100644 index 00000000000..50e2183a76c --- /dev/null +++ b/queue-3.14/drm-radeon-use-drm_mode_vrefresh-rather-than-mode-vrefresh.patch @@ -0,0 +1,29 @@ +From 3d2d98ee1af0cf6eebfbd6bff4c17d3601ac1284 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Wed, 18 Feb 2015 01:05:30 -0500 +Subject: drm/radeon: use drm_mode_vrefresh() rather than mode->vrefresh + +From: Alex Deucher + +commit 3d2d98ee1af0cf6eebfbd6bff4c17d3601ac1284 upstream. + +Just in case it hasn't been calculated for the mode. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/r600_dpm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/radeon/r600_dpm.c ++++ b/drivers/gpu/drm/radeon/r600_dpm.c +@@ -187,7 +187,7 @@ u32 r600_dpm_get_vrefresh(struct radeon_ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + radeon_crtc = to_radeon_crtc(crtc); + if (crtc->enabled && radeon_crtc->enabled && radeon_crtc->hw_mode.clock) { +- vrefresh = radeon_crtc->hw_mode.vrefresh; ++ vrefresh = drm_mode_vrefresh(&radeon_crtc->hw_mode); + break; + } + } diff --git a/queue-3.14/efi-small-leak-on-error-in-runtime-map-code.patch b/queue-3.14/efi-small-leak-on-error-in-runtime-map-code.patch new file mode 100644 index 00000000000..4e54c50925f --- /dev/null +++ b/queue-3.14/efi-small-leak-on-error-in-runtime-map-code.patch @@ -0,0 +1,32 @@ +From 86d68a58d00db3770735b5919ef2c6b12d7f06f3 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 15 Jan 2015 12:21:21 +0300 +Subject: efi: Small leak on error in runtime map code + +From: Dan Carpenter + +commit 86d68a58d00db3770735b5919ef2c6b12d7f06f3 upstream. + +The "> 0" here should ">= 0" so we free map_entries[0]. + +Fixes: 926172d46038 ('efi: Export EFI runtime memory mapping to sysfs') +Signed-off-by: Dan Carpenter +Acked-by: Dave Young +Signed-off-by: Matt Fleming +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firmware/efi/runtime-map.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/firmware/efi/runtime-map.c ++++ b/drivers/firmware/efi/runtime-map.c +@@ -170,7 +170,7 @@ int __init efi_runtime_map_init(struct k + + return 0; + out_add_entry: +- for (j = i - 1; j > 0; j--) { ++ for (j = i - 1; j >= 0; j--) { + entry = *(map_entries + j); + kobject_put(&entry->kobj); + } diff --git a/queue-3.14/series b/queue-3.14/series index 56b217a7301..33e730b6b9d 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -85,3 +85,7 @@ staging-comedi-cb_pcidas64-fix-incorrect-ai-range-code-handling.patch hid-input-fix-confusion-on-conflicting-mappings.patch hid-fixup-the-conflicting-keyboard-mappings-quirk.patch hid-wacom-report-abs_misc-event-for-cintiq-companion-hybrid.patch +drm-radeon-use-drm_mode_vrefresh-rather-than-mode-vrefresh.patch +drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch +efi-small-leak-on-error-in-runtime-map-code.patch +acpi-video-load-the-module-even-if-acpi-is-disabled.patch