--- /dev/null
+From 1d2cb9a54abc6e1d239f28f07661366d5662a94a Mon Sep 17 00:00:00 2001
+From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+Date: Fri, 7 Feb 2014 17:40:50 +0200
+Subject: drm/i915: Pair va_copy with va_end in i915_error_vprintf
+
+From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+
+commit 1d2cb9a54abc6e1d239f28f07661366d5662a94a upstream.
+
+Each invocation of va_copy() must be matched by a corresponding
+invocation of va_end() in the same function.
+
+This regression has been introduced in
+
+commit e29bb4ebbf000ff9ac081d29784a3331618f012e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Sep 20 10:20:59 2013 +0100
+
+ drm/i915: Use a temporary va_list for two-pass string handling
+
+Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_gpu_error.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/i915_gpu_error.c
++++ b/drivers/gpu/drm/i915/i915_gpu_error.c
+@@ -146,7 +146,10 @@ static void i915_error_vprintf(struct dr
+ va_list tmp;
+
+ va_copy(tmp, args);
+- if (!__i915_error_seek(e, vsnprintf(NULL, 0, f, tmp)))
++ len = vsnprintf(NULL, 0, f, tmp);
++ va_end(tmp);
++
++ if (!__i915_error_seek(e, len))
+ return;
+ }
+
--- /dev/null
+From 858a41c853cef2cb01de34dae334c19c1c15b237 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 30 Jan 2014 14:35:04 -0500
+Subject: drm/radeon: fix UVD IRQ support on 7xx
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 858a41c853cef2cb01de34dae334c19c1c15b237 upstream.
+
+Otherwise decoding isn't really useable.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/r600.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -3854,6 +3854,10 @@ restart_ih:
+ break;
+ }
+ break;
++ case 124: /* UVD */
++ DRM_DEBUG("IH: UVD int: 0x%08x\n", src_data);
++ radeon_fence_process(rdev, R600_RING_TYPE_UVD_INDEX);
++ break;
+ case 176: /* CP_INT in ring buffer */
+ case 177: /* CP_INT in IB1 */
+ case 178: /* CP_INT in IB2 */
--- /dev/null
+From b927e1c20462c1ad9caf4c4fa3a30e838a2d4037 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Thu, 30 Jan 2014 19:01:16 +0100
+Subject: drm/radeon: fix UVD IRQ support on SI
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+
+commit b927e1c20462c1ad9caf4c4fa3a30e838a2d4037 upstream.
+
+Otherwise decoding isn't really useable.
+
+bug:
+https://bugs.freedesktop.org/show_bug.cgi?id=71448
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/si.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/si.c
++++ b/drivers/gpu/drm/radeon/si.c
+@@ -6281,6 +6281,10 @@ restart_ih:
+ break;
+ }
+ break;
++ case 124: /* UVD */
++ DRM_DEBUG("IH: UVD int: 0x%08x\n", src_data);
++ radeon_fence_process(rdev, R600_RING_TYPE_UVD_INDEX);
++ break;
+ case 146:
+ case 147:
+ addr = RREG32(VM_CONTEXT1_PROTECTION_FAULT_ADDR);
lockd-send-correct-lock-when-granting-a-delayed-lock.patch
tty-n_gsm-fix-for-modems-with-brk-in-modem-status-control.patch
tty-set-correct-tty-name-in-active-sysfs-attribute.patch
+drm-radeon-fix-uvd-irq-support-on-7xx.patch
+drm-radeon-fix-uvd-irq-support-on-si.patch
+drm-i915-pair-va_copy-with-va_end-in-i915_error_vprintf.patch
+vt-fix-secure-clear-screen.patch
+usb-qcserial-add-netgear-aircard-340u.patch
--- /dev/null
+From f948dcf9e9973c05d957bc65b3185682f45feda3 Mon Sep 17 00:00:00 2001
+From: Bjørn Mork <bjorn@mork.no>
+Date: Tue, 4 Feb 2014 13:02:31 +0100
+Subject: usb: qcserial: add Netgear Aircard 340U
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit f948dcf9e9973c05d957bc65b3185682f45feda3 upstream.
+
+This device was mentioned in an OpenWRT forum. Seems to have a "standard"
+Sierra Wireless ifnumber to function layout:
+ 0: qcdm
+ 2: nmea
+ 3: modem
+ 8: qmi
+ 9: storage
+
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/qcserial.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -139,6 +139,9 @@ static const struct usb_device_id id_tab
+ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 0)}, /* Sierra Wireless EM7700 Device Management */
+ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 2)}, /* Sierra Wireless EM7700 NMEA */
+ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 3)}, /* Sierra Wireless EM7700 Modem */
++ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 0)}, /* Netgear AirCard 340U Device Management */
++ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 2)}, /* Netgear AirCard 340U NMEA */
++ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 3)}, /* Netgear AirCard 340U Modem */
+
+ { } /* Terminating entry */
+ };
--- /dev/null
+From 0930b0950a8996aa88b0d2ba4bb2bab27cc36bc7 Mon Sep 17 00:00:00 2001
+From: Petr Písař <petr.pisar@atlas.cz>
+Date: Thu, 6 Feb 2014 21:01:23 +0100
+Subject: vt: Fix secure clear screen
+
+From: Petr Písař <petr.pisar@atlas.cz>
+
+commit 0930b0950a8996aa88b0d2ba4bb2bab27cc36bc7 upstream.
+
+\E[3J console code (secure clear screen) needs to update_screen(vc)
+in order to write-through blanks into off-screen video memory.
+
+This has been removed accidentally in 3.6 by:
+
+commit 81732c3b2fede049a692e58a7ceabb6d18ffb18c
+Author: Jean-François Moine <moinejf@free.fr>
+Date: Thu Sep 6 19:24:13 2012 +0200
+
+ tty vt: Fix line garbage in virtual console on command line edition
+
+Signed-off-by: Petr Písař <petr.pisar@atlas.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/vt/vt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
+@@ -1164,6 +1164,8 @@ static void csi_J(struct vc_data *vc, in
+ scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
+ vc->vc_screenbuf_size >> 1);
+ set_origin(vc);
++ if (CON_IS_VISIBLE(vc))
++ update_screen(vc);
+ /* fall through */
+ case 2: /* erase whole display */
+ count = vc->vc_cols * vc->vc_rows;
projects / thirdparty / kernel / stable-queue.git / commitdiff
