diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 57e108a6f8..608e09489b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,7 +23,7 @@ case "$LINUX" in PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" ;; 3.14) - PKG_VERSION="3.14.5" + PKG_VERSION="3.14.6" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; *) diff --git a/packages/linux/patches/3.14.5/linux-999.05-ALSA-hda-hdmi-Set-converter-channel-count-even-witho.patch b/packages/linux/patches/3.14.5/linux-999.05-ALSA-hda-hdmi-Set-converter-channel-count-even-witho.patch deleted file mode 100644 index 69e677387d..0000000000 --- a/packages/linux/patches/3.14.5/linux-999.05-ALSA-hda-hdmi-Set-converter-channel-count-even-witho.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 299db7189ad00fdddae62c9841c25a4b7c835ce5 Mon Sep 17 00:00:00 2001 -From: Anssi Hannula -Date: Mon, 5 May 2014 01:32:48 +0300 -Subject: [PATCH 1/2] ALSA: hda - hdmi: Set converter channel count even - without sink - -Since commit 1df5a06a ("ALSA: hda - hdmi: Fix programmed active channel -count") channel count is no longer being set if monitor_present is 0. -This is because setting the count was moved after the CA value is -determined, which is only after the monitor_present check in -hdmi_setup_audio_infoframe(). - -Unfortunately, in some cases, such as with a non-spec-compliant codec or -with a problematic video driver, monitor_present is always 0. As a -specific example, this seems to happen with gen1 ATV (SiI1390 codec), -causing left-channel-only stereo playback (multi-channel playback has -apparently never worked with this codec despite it reporting 8 channels, -reason unknown). - -Simply setting converter channel count without setting the pin infoframe -and channel mapping as well does not theoretically make much sense as -this will just mean they are out-of-sync and multichannel playback will -have a wrong channel mapping. - -However, adding back just setting the converter channel count even in -no-monitor case is the safest change which at least fixes the stereo -playback regression on SiI1390 codec. Do that. - -Signed-off-by: Anssi Hannula -Reported-by: Stephan Raue -Tested-by: Stephan Raue -Cc: # 3.12+ ---- - sound/pci/hda/patch_hdmi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 0cb5b89cd0c8..1edbb9c47c2d 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1127,8 +1127,10 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, - AMP_OUT_UNMUTE); - - eld = &per_pin->sink_eld; -- if (!eld->monitor_present) -+ if (!eld->monitor_present) { -+ hdmi_set_channel_count(codec, per_pin->cvt_nid, channels); - return; -+ } - - if (!non_pcm && per_pin->chmap_set) - ca = hdmi_manual_channel_allocation(channels, per_pin->chmap); --- -1.8.4.5 - diff --git a/packages/linux/patches/3.14.5/linux-003-no_dev_console.patch b/packages/linux/patches/3.14.6/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-003-no_dev_console.patch rename to packages/linux/patches/3.14.6/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.14.5/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.14.6/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.14.6/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.14.5/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.14.6/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.14.6/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.14.5/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.14.6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.14.6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.14.5/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.14.6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.14.6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.14.5/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.14.6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.14.6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.14.5/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.14.6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.14.6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.14.5/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.14.6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.14.6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.14.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.14.6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.14.6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.14.5/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.14.6/linux-058.06-hid_sony-add_SMK_link.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-058.06-hid_sony-add_SMK_link.patch rename to packages/linux/patches/3.14.6/linux-058.06-hid_sony-add_SMK_link.patch diff --git a/packages/linux/patches/3.14.5/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.14.6/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.14.6/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.14.5/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.14.6/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.14.6/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.14.5/linux-061-nuvoton-cir-Activate-PNP-device-when-probing.patch b/packages/linux/patches/3.14.6/linux-061-nuvoton-cir-Activate-PNP-device-when-probing.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-061-nuvoton-cir-Activate-PNP-device-when-probing.patch rename to packages/linux/patches/3.14.6/linux-061-nuvoton-cir-Activate-PNP-device-when-probing.patch diff --git a/packages/linux/patches/3.14.5/linux-062-PNP-Work_around_BIOS_defects_in_Intel_MCH_area_reporting.patch b/packages/linux/patches/3.14.6/linux-062-PNP-Work_around_BIOS_defects_in_Intel_MCH_area_reporting.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-062-PNP-Work_around_BIOS_defects_in_Intel_MCH_area_reporting.patch rename to packages/linux/patches/3.14.6/linux-062-PNP-Work_around_BIOS_defects_in_Intel_MCH_area_reporting.patch diff --git a/packages/linux/patches/3.14.5/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.14.6/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.14.6/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.14.5/linux-210-dvbsky.patch b/packages/linux/patches/3.14.6/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-210-dvbsky.patch rename to packages/linux/patches/3.14.6/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.14.5/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.14.6/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.14.6/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.14.5/linux-221-ngene-octopus.patch b/packages/linux/patches/3.14.6/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.14.6/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.14.5/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.14.6/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.14.6/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.14.5/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.14.6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.14.6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.14.5/linux-224-geniatech-t220-dvb-t2-fix.patch b/packages/linux/patches/3.14.6/linux-224-geniatech-t220-dvb-t2-fix.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-224-geniatech-t220-dvb-t2-fix.patch rename to packages/linux/patches/3.14.6/linux-224-geniatech-t220-dvb-t2-fix.patch diff --git a/packages/linux/patches/3.14.5/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.14.6/linux-701-linksys_aes2500_brcmfmac.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-701-linksys_aes2500_brcmfmac.patch rename to packages/linux/patches/3.14.6/linux-701-linksys_aes2500_brcmfmac.patch diff --git a/packages/linux/patches/3.14.5/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.14.6/linux-703-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-703-macmini2012-ethernet.patch rename to packages/linux/patches/3.14.6/linux-703-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.14.5/linux-704-Support-for-Ubiquiti-WifiStation.patch b/packages/linux/patches/3.14.6/linux-704-Support-for-Ubiquiti-WifiStation.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-704-Support-for-Ubiquiti-WifiStation.patch rename to packages/linux/patches/3.14.6/linux-704-Support-for-Ubiquiti-WifiStation.patch diff --git a/packages/linux/patches/3.14.5/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch b/packages/linux/patches/3.14.6/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch rename to packages/linux/patches/3.14.6/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch diff --git a/packages/linux/patches/3.14.5/linux-706-Sitecom-N300.patch b/packages/linux/patches/3.14.6/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-706-Sitecom-N300.patch rename to packages/linux/patches/3.14.6/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/3.14.5/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.14.6/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.14.6/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.14.5/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.14.6/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.14.6/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.14.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.14.6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.14.6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.14.5/linux-991.01-ptrace_fix.patch b/packages/linux/patches/3.14.6/linux-991.01-ptrace_fix.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-991.01-ptrace_fix.patch rename to packages/linux/patches/3.14.6/linux-991.01-ptrace_fix.patch diff --git a/packages/linux/patches/3.14.5/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.14.6/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.14.6/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.14.5/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/packages/linux/patches/3.14.6/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch rename to packages/linux/patches/3.14.6/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch diff --git a/packages/linux/patches/3.14.5/linux-999.03-0001-fix-mceusb.patch b/packages/linux/patches/3.14.6/linux-999.03-0001-fix-mceusb.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-999.03-0001-fix-mceusb.patch rename to packages/linux/patches/3.14.6/linux-999.03-0001-fix-mceusb.patch diff --git a/packages/linux/patches/3.14.5/linux-999.03-drm-radeon-PLL-fixes.patch b/packages/linux/patches/3.14.6/linux-999.03-drm-radeon-PLL-fixes.patch similarity index 58% rename from packages/linux/patches/3.14.5/linux-999.03-drm-radeon-PLL-fixes.patch rename to packages/linux/patches/3.14.6/linux-999.03-drm-radeon-PLL-fixes.patch index 19536aea52..a8ca4299e1 100644 --- a/packages/linux/patches/3.14.5/linux-999.03-drm-radeon-PLL-fixes.patch +++ b/packages/linux/patches/3.14.6/linux-999.03-drm-radeon-PLL-fixes.patch @@ -597,348 +597,3 @@ index 0c26b3c..12a01e9 100644 -- 1.9.1 -From 6e26c28955078c20a78a41e03911d67b5f85bd55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= -Date: Wed, 23 Apr 2014 20:46:06 +0200 -Subject: [PATCH 6/6] drm/radeon: use pflip irq on R600+ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Christian König ---- - drivers/gpu/drm/radeon/cik.c | 76 +++++++++++++++++++++++++++++++++ - drivers/gpu/drm/radeon/cikd.h | 9 ++++ - drivers/gpu/drm/radeon/evergreen.c | 28 +++++++++--- - drivers/gpu/drm/radeon/r600.c | 10 +++-- - drivers/gpu/drm/radeon/radeon.h | 6 +++ - drivers/gpu/drm/radeon/radeon_display.c | 4 ++ - drivers/gpu/drm/radeon/si.c | 28 +++++++++--- - 7 files changed, 144 insertions(+), 17 deletions(-) - -diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c -index bbb1784..e29c9b2 100644 ---- a/drivers/gpu/drm/radeon/cik.c -+++ b/drivers/gpu/drm/radeon/cik.c -@@ -6662,6 +6662,19 @@ static void cik_disable_interrupt_state(struct radeon_device *rdev) - WREG32(LB_INTERRUPT_MASK + EVERGREEN_CRTC4_REGISTER_OFFSET, 0); - WREG32(LB_INTERRUPT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, 0); - } -+ /* pflip */ -+ if (rdev->num_crtc >= 2) { -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, 0); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, 0); -+ } -+ if (rdev->num_crtc >= 4) { -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, 0); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, 0); -+ } -+ if (rdev->num_crtc >= 6) { -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, 0); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, 0); -+ } - - /* dac hotplug */ - WREG32(DAC_AUTODETECT_INT_CONTROL, 0); -@@ -7018,6 +7031,25 @@ int cik_irq_set(struct radeon_device *rdev) - WREG32(LB_INTERRUPT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, crtc6); - } - -+ if (rdev->num_crtc >= 2) { -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ } -+ if (rdev->num_crtc >= 4) { -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ } -+ if (rdev->num_crtc >= 6) { -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ } -+ - WREG32(DC_HPD1_INT_CONTROL, hpd1); - WREG32(DC_HPD2_INT_CONTROL, hpd2); - WREG32(DC_HPD3_INT_CONTROL, hpd3); -@@ -7054,6 +7086,29 @@ static inline void cik_irq_ack(struct radeon_device *rdev) - rdev->irq.stat_regs.cik.disp_int_cont5 = RREG32(DISP_INTERRUPT_STATUS_CONTINUE5); - rdev->irq.stat_regs.cik.disp_int_cont6 = RREG32(DISP_INTERRUPT_STATUS_CONTINUE6); - -+ rdev->irq.stat_regs.cik.d1grph_int = RREG32(GRPH_INT_STATUS + -+ EVERGREEN_CRTC0_REGISTER_OFFSET); -+ rdev->irq.stat_regs.cik.d2grph_int = RREG32(GRPH_INT_STATUS + -+ EVERGREEN_CRTC1_REGISTER_OFFSET); -+ if (rdev->num_crtc >= 4) { -+ rdev->irq.stat_regs.cik.d3grph_int = RREG32(GRPH_INT_STATUS + -+ EVERGREEN_CRTC2_REGISTER_OFFSET); -+ rdev->irq.stat_regs.cik.d4grph_int = RREG32(GRPH_INT_STATUS + -+ EVERGREEN_CRTC3_REGISTER_OFFSET); -+ } -+ if (rdev->num_crtc >= 6) { -+ rdev->irq.stat_regs.cik.d5grph_int = RREG32(GRPH_INT_STATUS + -+ EVERGREEN_CRTC4_REGISTER_OFFSET); -+ rdev->irq.stat_regs.cik.d6grph_int = RREG32(GRPH_INT_STATUS + -+ EVERGREEN_CRTC5_REGISTER_OFFSET); -+ } -+ -+ if (rdev->irq.stat_regs.cik.d1grph_int & GRPH_PFLIP_INT_OCCURRED) -+ WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC0_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_CLEAR); -+ if (rdev->irq.stat_regs.cik.d2grph_int & GRPH_PFLIP_INT_OCCURRED) -+ WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC1_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_CLEAR); - if (rdev->irq.stat_regs.cik.disp_int & LB_D1_VBLANK_INTERRUPT) - WREG32(LB_VBLANK_STATUS + EVERGREEN_CRTC0_REGISTER_OFFSET, VBLANK_ACK); - if (rdev->irq.stat_regs.cik.disp_int & LB_D1_VLINE_INTERRUPT) -@@ -7064,6 +7119,12 @@ static inline void cik_irq_ack(struct radeon_device *rdev) - WREG32(LB_VLINE_STATUS + EVERGREEN_CRTC1_REGISTER_OFFSET, VLINE_ACK); - - if (rdev->num_crtc >= 4) { -+ if (rdev->irq.stat_regs.cik.d3grph_int & GRPH_PFLIP_INT_OCCURRED) -+ WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC2_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_CLEAR); -+ if (rdev->irq.stat_regs.cik.d4grph_int & GRPH_PFLIP_INT_OCCURRED) -+ WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC3_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_CLEAR); - if (rdev->irq.stat_regs.cik.disp_int_cont2 & LB_D3_VBLANK_INTERRUPT) - WREG32(LB_VBLANK_STATUS + EVERGREEN_CRTC2_REGISTER_OFFSET, VBLANK_ACK); - if (rdev->irq.stat_regs.cik.disp_int_cont2 & LB_D3_VLINE_INTERRUPT) -@@ -7075,6 +7136,12 @@ static inline void cik_irq_ack(struct radeon_device *rdev) - } - - if (rdev->num_crtc >= 6) { -+ if (rdev->irq.stat_regs.cik.d5grph_int & GRPH_PFLIP_INT_OCCURRED) -+ WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC4_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_CLEAR); -+ if (rdev->irq.stat_regs.cik.d6grph_int & GRPH_PFLIP_INT_OCCURRED) -+ WREG32(GRPH_INT_STATUS + EVERGREEN_CRTC5_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_CLEAR); - if (rdev->irq.stat_regs.cik.disp_int_cont4 & LB_D5_VBLANK_INTERRUPT) - WREG32(LB_VBLANK_STATUS + EVERGREEN_CRTC4_REGISTER_OFFSET, VBLANK_ACK); - if (rdev->irq.stat_regs.cik.disp_int_cont4 & LB_D5_VLINE_INTERRUPT) -@@ -7426,6 +7493,15 @@ restart_ih: - break; - } - break; -+ case 8: /* D1 page flip */ -+ case 9: /* D2 page flip */ -+ case 10: /* D3 page flip */ -+ case 11: /* D4 page flip */ -+ case 12: /* D5 page flip */ -+ case 13: /* D6 page flip */ -+ DRM_DEBUG("IH: D%d flip\n", src_id - 7); -+ radeon_crtc_handle_flip(rdev, src_id - 8); -+ break; - case 42: /* HPD hotplug */ - switch (src_data) { - case 0: -diff --git a/drivers/gpu/drm/radeon/cikd.h b/drivers/gpu/drm/radeon/cikd.h -index 98bae9d7..d1b2c71 100644 ---- a/drivers/gpu/drm/radeon/cikd.h -+++ b/drivers/gpu/drm/radeon/cikd.h -@@ -882,6 +882,15 @@ - # define DC_HPD6_RX_INTERRUPT (1 << 18) - #define DISP_INTERRUPT_STATUS_CONTINUE6 0x6780 - -+/* 0x6858, 0x7458, 0x10058, 0x10c58, 0x11858, 0x12458 */ -+#define GRPH_INT_STATUS 0x6858 -+# define GRPH_PFLIP_INT_OCCURRED (1 << 0) -+# define GRPH_PFLIP_INT_CLEAR (1 << 8) -+/* 0x685c, 0x745c, 0x1005c, 0x10c5c, 0x1185c, 0x1245c */ -+#define GRPH_INT_CONTROL 0x685c -+# define GRPH_PFLIP_INT_MASK (1 << 0) -+# define GRPH_PFLIP_INT_TYPE (1 << 8) -+ - #define DAC_AUTODETECT_INT_CONTROL 0x67c8 - - #define DC_HPD1_INT_STATUS 0x601c -diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c -index 27b0ff1..8ffee2b 100644 ---- a/drivers/gpu/drm/radeon/evergreen.c -+++ b/drivers/gpu/drm/radeon/evergreen.c -@@ -4375,7 +4375,6 @@ int evergreen_irq_set(struct radeon_device *rdev) - u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0; - u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6; - u32 grbm_int_cntl = 0; -- u32 grph1 = 0, grph2 = 0, grph3 = 0, grph4 = 0, grph5 = 0, grph6 = 0; - u32 afmt1 = 0, afmt2 = 0, afmt3 = 0, afmt4 = 0, afmt5 = 0, afmt6 = 0; - u32 dma_cntl, dma_cntl1 = 0; - u32 thermal_int = 0; -@@ -4558,15 +4557,21 @@ int evergreen_irq_set(struct radeon_device *rdev) - WREG32(INT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, crtc6); - } - -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, grph1); -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, grph2); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); - if (rdev->num_crtc >= 4) { -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, grph3); -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, grph4); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); - } - if (rdev->num_crtc >= 6) { -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, grph5); -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, grph6); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); - } - - WREG32(DC_HPD1_INT_CONTROL, hpd1); -@@ -4955,6 +4960,15 @@ restart_ih: - break; - } - break; -+ case 8: /* D1 page flip */ -+ case 9: /* D2 page flip */ -+ case 10: /* D3 page flip */ -+ case 11: /* D4 page flip */ -+ case 12: /* D5 page flip */ -+ case 13: /* D6 page flip */ -+ DRM_DEBUG("IH: D%d flip\n", src_id - 7); -+ radeon_crtc_handle_flip(rdev, src_id - 8); -+ break; - case 42: /* HPD hotplug */ - switch (src_data) { - case 0: -diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c -index 647ef40..114a3ef 100644 ---- a/drivers/gpu/drm/radeon/r600.c -+++ b/drivers/gpu/drm/radeon/r600.c -@@ -3509,7 +3509,6 @@ int r600_irq_set(struct radeon_device *rdev) - u32 hpd1, hpd2, hpd3, hpd4 = 0, hpd5 = 0, hpd6 = 0; - u32 grbm_int_cntl = 0; - u32 hdmi0, hdmi1; -- u32 d1grph = 0, d2grph = 0; - u32 dma_cntl; - u32 thermal_int = 0; - -@@ -3618,8 +3617,8 @@ int r600_irq_set(struct radeon_device *rdev) - WREG32(CP_INT_CNTL, cp_int_cntl); - WREG32(DMA_CNTL, dma_cntl); - WREG32(DxMODE_INT_MASK, mode_int); -- WREG32(D1GRPH_INTERRUPT_CONTROL, d1grph); -- WREG32(D2GRPH_INTERRUPT_CONTROL, d2grph); -+ WREG32(D1GRPH_INTERRUPT_CONTROL, DxGRPH_PFLIP_INT_MASK); -+ WREG32(D2GRPH_INTERRUPT_CONTROL, DxGRPH_PFLIP_INT_MASK); - WREG32(GRBM_INT_CNTL, grbm_int_cntl); - if (ASIC_IS_DCE3(rdev)) { - WREG32(DC_HPD1_INT_CONTROL, hpd1); -@@ -3922,6 +3921,11 @@ restart_ih: - break; - } - break; -+ case 9: /* D1 pflip */ -+ case 10: /* D2 pflip */ -+ DRM_DEBUG("IH: D%d flip\n", src_id - 8); -+ radeon_crtc_handle_flip(rdev, src_id - 9); -+ break; - case 19: /* HPD/DAC hotplug */ - switch (src_data) { - case 0: -diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h -index e887d02..5587de9 100644 ---- a/drivers/gpu/drm/radeon/radeon.h -+++ b/drivers/gpu/drm/radeon/radeon.h -@@ -733,6 +733,12 @@ struct cik_irq_stat_regs { - u32 disp_int_cont4; - u32 disp_int_cont5; - u32 disp_int_cont6; -+ u32 d1grph_int; -+ u32 d2grph_int; -+ u32 d3grph_int; -+ u32 d4grph_int; -+ u32 d5grph_int; -+ u32 d6grph_int; - }; - - union radeon_irq_stat_regs { -diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c -index 12a01e9..5e4326f 100644 ---- a/drivers/gpu/drm/radeon/radeon_display.c -+++ b/drivers/gpu/drm/radeon/radeon_display.c -@@ -284,6 +284,10 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id) - u32 update_pending; - int vpos, hpos; - -+ /* can happen during initialization */ -+ if (radeon_crtc == NULL) -+ return; -+ - spin_lock_irqsave(&rdev->ddev->event_lock, flags); - work = radeon_crtc->unpin_work; - if (work == NULL || -diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c -index 9a124d0..2b47e53 100644 ---- a/drivers/gpu/drm/radeon/si.c -+++ b/drivers/gpu/drm/radeon/si.c -@@ -5777,7 +5777,6 @@ int si_irq_set(struct radeon_device *rdev) - u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0; - u32 hpd1 = 0, hpd2 = 0, hpd3 = 0, hpd4 = 0, hpd5 = 0, hpd6 = 0; - u32 grbm_int_cntl = 0; -- u32 grph1 = 0, grph2 = 0, grph3 = 0, grph4 = 0, grph5 = 0, grph6 = 0; - u32 dma_cntl, dma_cntl1; - u32 thermal_int = 0; - -@@ -5916,16 +5915,22 @@ int si_irq_set(struct radeon_device *rdev) - } - - if (rdev->num_crtc >= 2) { -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, grph1); -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, grph2); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); - } - if (rdev->num_crtc >= 4) { -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, grph3); -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, grph4); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); - } - if (rdev->num_crtc >= 6) { -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, grph5); -- WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, grph6); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); -+ WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, -+ GRPH_PFLIP_INT_MASK); - } - - if (!ASIC_IS_NODCE(rdev)) { -@@ -6289,6 +6294,15 @@ restart_ih: - break; - } - break; -+ case 8: /* D1 page flip */ -+ case 9: /* D2 page flip */ -+ case 10: /* D3 page flip */ -+ case 11: /* D4 page flip */ -+ case 12: /* D5 page flip */ -+ case 13: /* D6 page flip */ -+ DRM_DEBUG("IH: D%d flip\n", src_id - 7); -+ radeon_crtc_handle_flip(rdev, src_id - 8); -+ break; - case 42: /* HPD hotplug */ - switch (src_data) { - case 0: --- -1.9.1 - - diff --git a/packages/linux/patches/3.14.5/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch b/packages/linux/patches/3.14.6/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch similarity index 100% rename from packages/linux/patches/3.14.5/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch rename to packages/linux/patches/3.14.6/linux-999.04-revert-xhci-Set-scatter-gather-limit.patch