aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
Commit message (Collapse)AuthorAgeFilesLines
* Merge kernel.org linux-3.0.y into HEADKalimochoAz2012-10-314-5/+18
|\
| * drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13Sjoerd Simons2012-10-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | commit 9756fe38d10b2bf90c81dc4d2f17d5632e135364 upstream. This box claims to have an LVDS interface but doesn't actually have one. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/i915: apply timing generator bug workaround on CPT and PPTJesse Barnes2012-10-282-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3bcf603f6d5d18bd9d076dc280de71f48add4101 upstream. On CougarPoint and PantherPoint PCH chips, the timing generator may fail to start after DP training completes. This is due to a bug in the FDI autotraining detect logic (which will stall the timing generator and re-enable it once training completes), so disable it to avoid silent DP mode setting failures. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
| * drm/radeon: Don't destroy I2C Bus Rec in radeon_ext_tmds_enc_destroy().Egbert Eich2012-10-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 082918471139b07964967cfe5f70230909c82ae1 upstream. radeon_i2c_fini() walks thru the list of I2C bus recs rdev->i2c_bus[] to destroy each of them. radeon_ext_tmds_enc_destroy() however also has code to destroy it's associated I2C bus rec which has been obtained by radeon_i2c_lookup() and is therefore also in the i2c_bus[] list. This causes a double free resulting in a kernel panic when unloading the radeon driver. Removing destroy code from radeon_ext_tmds_enc_destroy() fixes this problem. agd5f: fix compiler warning Signed-off-by: Egbert Eich <eich@suse.de> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge commit '85ce022' into HEADKalimochoAz2012-10-142-2/+16
|\ \ | |/
| * drm/radeon: force MSIs on RS690 asicsAlex Deucher2012-10-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | commit fb6ca6d154cdcd53e7f27f8dbba513830372699b upstream. There are so many quirks, lets just try and force this for all RS690s. See: https://bugs.freedesktop.org/show_bug.cgi?id=37679 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon: Add MSI quirk for gateway RS690Alex Deucher2012-10-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | commit 3a6d59df80897cc87812b6826d70085905bed013 upstream. Fixes another system on: https://bugs.freedesktop.org/show_bug.cgi?id=37679 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon: only adjust default clocks on NI GPUsAlex Deucher2012-10-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | commit 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 upstream. SI asics store voltage information differently so we don't have a way to deal with it properly yet. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge commit 'b9a7985' into HEADKalimochoAz2012-10-142-2/+2
|\ \ | |/ | | | | | | Conflicts: kernel/time/timekeeping.c
| * drm/i915: HDMI - Clear Audio Enable bit for Hot PlugWang Xingchao2012-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b98b60167279df3acac9422c3c9820d9ebbcf9fb upstream. Clear Audio Enable bit to trigger unsolicated event to notify Audio Driver part the HDMI hot plug change. The patch fixed the bug when remove HDMI cable the bit was not cleared correctly. In intel_hdmi_dpms(), if intel_hdmi->has_audio been true, the "Audio enable bit" will be set to trigger unsolicated event to notify Alsa driver the change. intel_hdmi->has_audio will be reset to false from intel_hdmi_detect() after remove the hdmi cable, here's debug log: [ 187.494153] [drm:output_poll_execute], [CONNECTOR:17:HDMI-A-1] status updated from 1 to 2 [ 187.525349] [drm:intel_hdmi_detect], HDMI: has_audio = 0 so when comes back to intel_hdmi_dpms(), the "Audio enable bit" will not be cleared. And this cause the eld infomation and pin presence doesnot update accordingly in alsa driver side. This patch will also trigger unsolicated event to alsa driver to notify the hot plug event: [ 187.853159] ALSA sound/pci/hda/patch_hdmi.c:772 HDMI hot plug event: Codec=3 Pin=5 Presence_Detect=0 ELD_Valid=1 [ 187.853268] ALSA sound/pci/hda/patch_hdmi.c:990 HDMI status: Codec=3 Pin=5 Presence_Detect=0 ELD_Valid=0 Signed-off-by: Wang Xingchao <xingchao.wang@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon/kms: extend the Fujitsu D3003-S2 board connector quirk to cover ↵Tvrtko Ursulin2012-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | later silicon stepping commit 52e9b39d9a89ae33662596bd30e62dd56bddbe73 upstream. There is a more recent APU stepping with a new PCI ID shipping in the same board by Fujitsu which needs the same quirk to correctly mark the back plane connectors. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge remote-tracking branch 'korg/linux-3.0.y' into HEADKalimochoAz2012-09-161-0/+1
|\ \ | |/
| * drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at bootDave Airlie2012-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | commit c4903429a92be60e6fe59868924a65eca4cd1a38 upstream. This will cause udev to load vmwgfx instead of waiting for X to do it. Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-08-307-90/+48
|\ \ | |/ | | | | | | Conflicts: drivers/net/tun.c
| * drm/radeon: do not reenable crtc after moving vram start addressJerome Glisse2012-08-263-76/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 81ee8fb6b52ec69eeed37fe7943446af1dccecc5 upstream. It seems we can not update the crtc scanout address. After disabling crtc, update to base address do not take effect after crtc being reenable leading to at least frame being scanout from the old crtc base address. Disabling crtc display request lead to same behavior. So after changing the vram address if we don't keep crtc disabled we will have the GPU trying to read some random system memory address with some iommu this will broke the crtc engine and will lead to broken display and iommu error message. So to avoid this, disable crtc. For flicker less boot we will need to avoid moving the vram start address. This patch should also fix : https://bugs.freedesktop.org/show_bug.cgi?id=42373 Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/i915: correctly order the ring init sequenceDaniel Vetter2012-08-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0d8957c8a90bbb5d34fab9a304459448a5131e06 upstream. We may only start to set up the new register values after having confirmed that the ring is truely off. Otherwise the hw might lose the newly written register values. This is caught later on in the init sequence, when we check whether the register writes have stuck. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50522 Tested-by: Yang Guang <guang.a.yang@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon: on hotplug force link training to happen (v2)Jerome Glisse2012-08-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ca2ccde5e2f24a792caa4cca919fc5c6f65d1887 upstream. To have DP behave like VGA/DVI we need to retrain the link on hotplug. For this to happen we need to force link training to happen by setting connector dpms to off before asking it turning it on again. v2: agd5f - drop the dp_get_link_status() change in atombios_dp.c for now. We still need the dpms OFF change. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2)Jerome Glisse2012-08-091-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 266dcba541a1ef7e5d82d9e67c67fde2910636e8 upstream. No need to retrain the link for passive adapters. v2: agd5f - no passive DP to VGA adapters, update comments - assign radeon_connector_atom_dig after we are sure we have a digital connector as analog connectors have different private data. - get new sink type before checking for retrain. No need to check if it's no longer a DP connection. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon: fix non revealent error messageJerome Glisse2012-08-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8d1c702aa0b2c4b22b0742b72a1149d91690674b upstream. We want to print link status query failed only if it's an unexepected fail. If we query to see if we need link training it might be because there is nothing connected and thus link status query have the right to fail in that case. To avoid printing failure when it's expected, move the failure message to proper place. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/radeon: Try harder to avoid HW cursor ending on a multiple of 128 columns.Michel Dänzer2012-08-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f60ec4c7df043df81e62891ac45383d012afe0da upstream. This could previously fail if either of the enabled displays was using a horizontal resolution that is a multiple of 128, and only the leftmost column of the cursor was (supposed to be) visible at the right edge of that display. The solution is to move the cursor one pixel to the left in that case. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33183 Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-07-273-3/+6
|\ \ | |/ | | | | | | Conflicts: arch/arm/kernel/smp.c
| * drm/i915: Fix eDP blank screen after S3 resume on HP desktopsTakashi Iwai2012-07-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 6db65cbb941f9d433659bdad02b307f6d94465df upstream. This patch fixes the problem on some HP desktop machines with eDP which give blank screens after S3 resume. It turned out that BLC_PWM_CPU_CTL must be written after BLC_PWM_CPU_CTL2. Otherwise it doesn't take effect on these SNB machines. Tested with 3.5-rc3 kernel. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49233 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/nouveau/fbcon: using nv_two_heads is not a good ideaBen Skeggs2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9bd0c15fcfb42f6245447c53347d65ad9e72080b upstream. nv_two_heads() was never meant to be used outside of pre-nv50 code. The code checks for >= NV_10 for 2 CRTCs, then downgrades a few specific chipsets to 1 CRTC based on (pci_device & 0x0ff0). The breakage example seen is on GTX 560Ti, with a pciid of 0x1200, which gets detected as an NV20 (0x020x) with 1 CRTC by nv_two_heads(), causing memory corruption because there's actually 2 CRTCs.. This switches fbcon to use the CRTC count directly from the mode_config structure, which will also fix the same issue on Kepler boards which have 4 CRTCs. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * drm/edid: don't return stack garbage from supports_rbDaniel Vetter2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b196a4980ff7bb54db478e2a408dc8b12be15304 upstream. We need to initialize this to false, because the is_rb callback only ever sets it to true. Noticed while reading through the code. Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge remote-tracking branch 'google/android-samsung-3.0-jb' into ↵KalimochoAz2012-07-222-5/+7
|\ \ | | | | | | | | | | | | | | | | | | EnviarKernelJellybean Conflicts: drivers/gpu/pvr/pvrversion.h
| * | gpu: pvr: Update to DDK 1.8@2112805Alistair Strachan2012-07-131-6/+6
| | | | | | | | | | | | | | | | | | | | | This is a version number change only, which is required for compatibility with the user-mode driver. Change-Id: Id83c23254db8f6aac8f2f7ded8bae9040cbe5402
| * | gpu: pvr: Dump active page table when lockup is detected.Alistair Strachan2012-07-091-0/+2
| | |
* | | Update pvr version numberKalimochoAz2012-07-201-1/+1
| | |
* | | Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEADKalimochoAz2012-07-2045-856/+3678
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s5pv210/mach-herring.c drivers/media/video/samsung/fimc/fimc_dev.c include/trace/events/cpufreq_interactive.h
| * | gpu: pvr: Flush the whole CPU cache when allocating uncached.Alistair Strachan2012-06-202-0/+5
| | | | | | | | | | | | | | | | | | | | | This is a workaround for range-based CPU cache invalidation apparently not working reliably. Change-Id: I62fe3d10a465ee630729d7edf054f7bc82a422d8
| * | Revert "gpu: pvr: Add thread safety checks to SGX MMU code."jp abgrall2012-06-182-107/+2
| | | | | | | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit ca5c535e1e9cae41831adae5a29a76f848f7f792
| * | Revert "gpu: pvr: Fix a bug that prevented MMU PTs from being dumped."jp abgrall2012-06-181-1/+7
| | | | | | | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit 5a7b9539f5c1a9bb35131014907929a2da3fa723
| * | Revert "gpu: pvr: Harden MMU code's use-after-free checks."jp abgrall2012-06-181-31/+9
| | | | | | | | | | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit d00c00ef81aba03db7d7ebcdbc0ca7c11de5d2ec
| * | Revert "gpu: pvr: Intentionally leak SGX MMU PTs."jp abgrall2012-06-181-5/+2
| | | | | | | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit ce3815df4836c1f8e10f7a71213b4d2d7615c496
| * | gpu: pvr: Intentionally leak SGX MMU PTs.Alistair Strachan2012-06-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When page tables would normally be freed, leak them instead. This experiment is to try to prove a distinction between a use-after-free type bug and another driver corrupting our page tables. At the point the asserts go off, we don't expect the page to have been freed yet. So it should contain only valid PTEs. If however the PT is being used after free, it might contain junk from other kernel drivers. If we don't free the PTs, the latter should never happen. Change-Id: I69714cfd0ee81adb9a60a996d11e8373e209dfa9
| * | Revert "gpu: pvr: Intentionally leak SGX MMU PTs."JP Abgrall2012-06-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | Clicked submit in the wrong window. It needs to go after some other change. This reverts commit cc92b070b828b739cb5653407f8d22ca04762de2 Change-Id: Ie2cc8d1715af6b9c40145f5f3e857051916bea0a Signed-off-by: JP Abgrall <jpa@google.com>
| * | gpu: pvr: Harden MMU code's use-after-free checks.Alistair Strachan2012-06-141-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | Add signature words to MMU_CONTEXT and MMU_PT_INFO. These words are initialized at alloc time and zeroed at free time. They are checked any time a page table is validated before being freed. Change-Id: I74aa57c1e8b48e89bfbb1f4f8a4120c54859122f
| * | gpu: pvr: Intentionally leak SGX MMU PTs.Alistair Strachan2012-06-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When page tables would normally be freed, leak them instead. This experiment is to try to prove a distinction between a use-after-free type bug and another driver corrupting our page tables. At the point the asserts go off, we don't expect the page to have been freed yet. So it should contain only valid PTEs. If however the PT is being used after free, it might contain junk from other kernel drivers. If we don't free the PTs, the latter should never happen. Change-Id: I3046bb81896ed6ae4ea1f2de19a62a0e5e89e063
| * | gpu: pvr: Fix a bug that prevented MMU PTs from being dumped.Alistair Strachan2012-06-141-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DumpPT already had a static inline if PT_DEBUG or PT_DUMP weren't defined, so it shouldn't have been #ifdef guarded. Furthermore, PT_DEBUG isn't enabled so DumpPT would not have been called to dump the page tables in one case. This is incorrect as it should have been called if PT_DUMP was enabled. Change-Id: I4a0d2a3665b7586a5dfa4390098df4edb6edfe74
| * | gpu: pvr: Add thread safety checks to SGX MMU code.Alistair Strachan2012-06-142-2/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SGX MMU code was not designed to be used from multiple driver threads. One theory is that somehow the driver does sometimes use the MMU code from multiple threads, which could cause corruption of meta data. We must allow PID 1 through because the kernel uses this ID before userspace is up, and the module_init code interacts with the MMU subsystem. Otherwise, check that the outer bridge lock is held. If it is held, check the PID of the caller matches the PID holding the bridge lock. Change-Id: I35f42f251316b158576e5d853f8099e24942b4f2
| * | gpu: pvr: Update to DDK 1.8@945322Alistair Strachan2012-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | | This is a version number change only, for compatibility with the user-mode driver. Change-Id: I272428a490fbbd18ce9016e92e82829c5dc6b898
| * | Revert "gpu: pvr: Update to DDK 1.8@943950"JP Abgrall2012-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit a4f4aa198065e8d33f86cf3567bb4aba0eac5eef. The DDK change is not yet qualified as a JB release. But there is a USB VBUS fix needed.
| * | gpu: pvr: Update to DDK 1.8@943950Ben Jones2012-06-011-3/+3
| | | | | | | | | | | | | | | | | | | | | This is a version number change only, for compatibility with the user-mode driver. Change-Id: I0cfc6d73c1a386597f96efa97a3bd2e2d366e760
| * | gpu: pvr: Update to DDK 1.8@905891Ben Jones2012-05-142-57/+80
| | | | | | | | | | | | | | | | | | - Fix some bugs in the newly introduced memory pool code (b/6096575) Change-Id: Ib505041f98ffedf9ae785c79d49ce719202cacb0
| * | gpu: pvr: Update to DDK 1.8@904153Alistair Strachan2012-05-1413-458/+1213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix http://b/6446135 "eglHibernateProcessIMG slows down.." Release the bridge mutex in various places while waiting on the hardware. Permits multiple userspace processes/threads entering the driver simulataneously in some controlled cases. - Fix http://b/6096575 "some gralloc operations are very slow" Add a shrinkable pool for uncached memory allocations. Change-Id: I5a2554b351e10b3b35aaccc0ae943a78c1af673c
| * | Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-05-082-17/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: (49 commits) Linux 3.0.31 hfsplus: Fix potential buffer overflows sched: Fix nohz load accounting -- again! wl1251: fix crash on remove due to leftover work item wl1251: fix crash on remove due to premature kfree rtlwifi: Fix oops on unload mac80211: fix AP mode EAP tx for VLAN stations ipw2200: Fix race condition in the command completion acknowledge i2c: pnx: Disable clk in suspend libata: skip old error history when counting probe trials hwmon: (coretemp) fix oops on cpu unplug hwmon: (coretemp) Increase CPU core limit efivars: Improve variable validation efi: Validate UEFI boot variables efivars: fix warnings when CONFIG_PSTORE=n efivars: String functions efi: Add new variable attributes SCSI: libsas: fix false positive 'device attached' conditions SCSI: libsas: fix sas_find_bcast_phy() in the presence of 'vacant' phys ARM: 7403/1: tls: remove covert channel via TPIDRURW ...
| | * \ Merge commit 'v3.0.31' into android-3.0Todd Poynor2012-05-082-17/+25
| | |\ \
| * | \ \ Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-05-044-3/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: (135 commits) net: wireless: bcmdhd: Avoid turning radio UP twice on start cpufreq: interactive: add boost pulse interface net: wireless: bcmdhd: Set MMC_PM_KEEP_POWER flag on suspend net: wireless: bcmdhd: Update to Version 5.90.195.61 net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend arm: vfp: Fix memory corruption on PM suspend Linux 3.0.30 tcp: fix TCP_MAXSEG for established IPv6 passive sockets net ax25: Reorder ax25_exit to remove races. ksz884x: don't copy too much in netdev_set_mac_address() netns: do not leak net_generic data on failed init tcp: fix tcp_grow_window() for large incoming frames dummy: Add ndo_uninit(). net: usb: smsc75xx: fix mtu net_sched: gred: Fix oops in gred_dump() in WRED mode net/ethernet: ks8851_mll fix rx frame buffer overflow net: smsc911x: fix skb handling in receive path 8139cp: set intr mask after its handler is registered atl1: fix kernel panic in case of DMA errors ...
| | * | | Merge commit 'v3.0.30' into android-3.0Todd Poynor2012-04-304-3/+13
| | |\ \ \
| * | | | | gpu: pvr: Update to DDK 1.8@901807Alistair Strachan2012-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee12a4cbba24269b0a6901324ee2e07b5119a063