aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-21perf tools: Fix lazy wildcard matchingMasami Hiramatsu1-1/+1
Fix lazy wildcard matching to ignore space after wild card. Cc: [email protected] Cc: Frederic Weisbecker <[email protected]> Cc: Hitoshi Mitake <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Srikar Dronamraju <[email protected]> Cc: Steven Rostedt <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Masami Hiramatsu <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2010-12-21net: Fix range checks in tcf_valid_offset().David S. Miller1-1/+3
This function has three bugs: 1) The offset should be valid most of the time, this is just a sanity check, therefore we should use "likely" not "unlikely" 2) This is the only place where we can check for arithmetic overflow of the pointer plus the length. 3) The existing range checks are off by one, the valid range is skb->head to skb_tail_pointer(), inclusive. Based almost entirely upon a patch by Ralph Loader. Reported-by: Ralph Loader <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-21mmc: Fix re-probing with PM_POST_RESTORE notificationTakashi Iwai1-0/+1
In the error-path where PM notifies PM_POST_RESTORE, the rescan-blockage should be cleared as well. Otherwise it'll be never re-probed. Also, as a bonus, this fixes a bug in S4 with user-mode suspend in the current code, as it sends PM_POST_RESTORE instead of PM_POST_HIBERNATION wrongly. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2010-12-21mmc: atmel-mci: fix multiblock SDIO transfersNicolas Ferre1-6/+12
Based on report made by Yauhen in: "MMC: Fix multiblock SDIO transfers in AT91 MCI" patch, I report those changes to the brother driver: atmel-mci. So, this patch sets SDIO transfer types: SDIO block and SDIO byte transfers instead of using ordinary MMC block transfers. It is checking opcode for SDIO CMD53 and setting transfer type in MCI_CMDR register properly. Reported-by: Yauhen Kharuzhy <[email protected]> Cc: <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2010-12-21mmc: at91_mci: fix multiblock SDIO transfersYauhen Kharuzhy2-4/+11
The AT91 MCI has special SDIO transfer types: SDIO block and SDIO byte transfers, but at91_mci driver doesn't use them and handles all SDIO transfers as ordinary MMC block transfers. This causes problems for multiple-block SDIO transfers (in particular for 256-bytes blocks). Fix this situation by checking the opcode for SDIO CMD53 and setting the transfer type in the AT91_MCI_CMDR register properly. This patch was tested with libertas SDIO driver: problem with TX timeouts on big packets was eliminated. Signed-off-by: Yauhen Kharuzhy <[email protected]> Cc: <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2010-12-21Linux 2.6.37-rc7Linus Torvalds1-1/+1
2010-12-21[SCSI] fix up documentation for change in ->queuecommand to lockless callingJames Bottomley1-28/+31
The current doc still says we call it with the host lock held, which is going to cause confusion. Signed-off-by: James Bottomley <[email protected]>
2010-12-21ALSA: hda - Don't apply ALC269-specific initialization to ALC275Kailang Yang1-22/+23
ALC275 doesn't require the ALC269 (and its variants) specific init sequences. Add the check of codec id. Signed-off-by: Kailang Yang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-12-21ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecsKailang Yang1-0/+12
Set GPIO2 for some Sony VAIO with ALC275 to fix speaker output. Signed-off-by: Kailang Yang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-12-21drm/nvc0: accelerate ttm buffer movesBen Skeggs1-1/+56
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: initial support for tiled buffer objectsBen Skeggs5-25/+62
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: implement fbcon accelerationBen Skeggs4-6/+300
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: implement pgraph engine hooksBen Skeggs6-3/+3631
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: implement pfifo engine hooksBen Skeggs2-0/+361
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: implement fencingBen Skeggs1-8/+20
Just simple REF_CNT fencing for the moment. Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: fix channel dma init pathsBen Skeggs3-10/+38
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: skip dma object creation for drm channelBen Skeggs1-0/+5
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: implement channel structure initialisationBen Skeggs1-4/+20
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: gpuobj_new need only check validity and init the relevant engineBen Skeggs1-4/+11
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: reject the notifier_alloc ioctlBen Skeggs1-0/+5
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: create shared channel vmBen Skeggs1-0/+16
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: initial vm implementation, use for bar1/bar3 managementBen Skeggs8-204/+266
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nvc0: import initial vm backendBen Skeggs7-7/+169
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nouveau: modify vm to accomodate dual page tables for nvc0Ben Skeggs4-75/+65
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21ALSA: pcm: remember to always call va_end() on stuff that we va_start()Jesper Juhl1-3/+7
The Coverity checker spotted that we do not always remember to call va_end() on 'args' in failure paths in snd_pcm_hw_rule_add(). Here's a patch to fix that up (compile tested only) - it also removes some annoying trailing whitespace that caught my eye while I was in the area.. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-12-20Merge branch 'tty-linus' of ↵Linus Torvalds1-2/+4
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked n_gsm: Fix message length handling when building header
2010-12-20Merge branch 'usb-linus' of ↵Linus Torvalds7-22/+50
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: Revert "USB: gadget: Allow function access to device ID data during bind()" USB: misc: uss720.c: add another vendor/product ID USB: usb-storage: unusual_devs entry for the Samsung YP-CP3 USB: gadget: Remove suspended sysfs file before freeing cdev USB: core: Add input prompt and help text for USB_OTG config USB: ftdi_sio: Add D.O.Tec PID xhci: Fix issue with port array setup and buggy hosts.
2010-12-20Merge branch 'for-linus' of ↵Linus Torvalds5-30/+41
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: handle partial result from get_user_pages ceph: mark user pages dirty on direct-io reads ceph: fix null pointer dereference in ceph_init_dentry for nfs reexport ceph: fix direct-io on non-page-aligned buffers ceph: fix msgr_init error path
2010-12-20Fix build error in drivers/block/cciss.cLinus Torvalds1-1/+1
.. caused by a missing semi-colon, introduced in commit 0fc13c8995cd ("cciss: fix cciss_revalidate panic"). Reported-by: Stephen Rothwell <[email protected]> Reported-by: Thiago Farina <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-12-21drm/radeon/kms: parse the extended LCD info blockAlex Deucher4-5/+67
This block may contain various additional LCD info such as physical size and a stored EDID. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms: use LCD physical size from vbios tables if availableAlex Deucher2-0/+6
Some systems have the LCD width and height in mm available in the LCD info table. Use this info if there is no EDID to provide it. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm-vblank: Always return true vblank count of scheduled vblank event.Mario Kleiner1-0/+3
This patch tries to make sure that the vbl.reply.sequence vblank count for a queued or emitted vblank event always corresponds to the true vblank count of queueing/emission, so the ddx can rely on the returned target_msc for consistency checks and implementation of swap_intervals in glXSwapBuffers(). Without this there is a small race-condition between the userspace ddx queueing a vblank event and the vblank counter incrementing before the event gets queued in the kernel. Signed-off-by: Mario Kleiner <[email protected]> Acked-by: Jesse Barnes <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/kms: load fbcon from drm_kms_helperDavid Fries1-0/+21
Kconfig says fbcon is required by drm_kms_helper. If radeon, fbcon, and drm_kms_helper are all modules, radeon is auto loaded (by PCI id?), drm_kms_helper is loaded because of the module dependency, but fbcon isn't loaded leaving the console unusable. Since fbcon is required and there isn't an explicit module dependency, request the module to be loaded from drm_kms_helper. Signed-off-by: David Fries <[email protected]> Cc: David Airlie <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms/atom: clean up op_mask handlerAlex Deucher1-7/+7
Readability cleanup and fix debugging output, no functional change. Reported-by: Frank Huang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms: fix DCE4.1 dig routing (v2)Alex Deucher1-29/+25
Works more like DCE4.0 despite what the docs say. This fixes blank screen issues when changing crtc routing due to incorrect crtc to dig mapping. v2: only two DIGx blocks, routing is hardcoded based on link. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms: allow r500 US_FORMAT regs in the CS checkerMarek Olšák2-1/+17
add to the 2.8 bump for pageflip The purpose of these regs is to work around a TX hw bug in R520. Signed-off-by: Marek Olšák <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon: Definition of R_0003C2_GENMO_WT seems wrongTijl Coosemans1-1/+1
In drivers/gpu/drm/radeon/r100d.h R_0003C2_GENMO_WT is defined as 0x3C0. I think this should be 0x3C2. Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms: reorder display resume to avoid problemsAlex Deucher2-6/+6
On resume, we were attemping to unblank the displays before the timing and plls had be reprogrammed which led to atom timeouts waiting for things that are not yet programmed. Re-program the mode first, then reset the dpms state. This fixes the infamous atombios timeouts on resume. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms/evergreen: reset the grbm blocks at resume and initAlex Deucher1-0/+10
This fixes module reloading and resume as the gfx block seems to be left in a bad state in some cases. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon/kms: fix evergreen asic resetAlex Deucher1-15/+0
Only reset the grbm blocks, srbm tends to lock the GPU if not done properly and in most cases is not necessary. Also, no need to call asic init after reset the grbm blocks. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Reviewed-by: Jerome Glisse <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/fb: Don't expose mmio for fbdev emulation layerJames Simmons5-14/+4
For the fbdev api if the struct fb_var_screeninfo accel_flags field is set to FB_ACCELF_TEXT then userland applications can not mmap the mmio region. Since it is a bad idea for DRM drivers to expose the mmio region via the fbdev layer we always set the accel_flags to prevent this. Please apply. Signed-off-by: James Simmons <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-12-21Revert "drm: Don't try and disable an encoder that was never enabled"Dave Airlie1-1/+1
This reverts commit 541cc966915b6756e54c20eebe60ae957afdb537. Wei Yonjun reported this caused a regression against Intel VGA hotplug on his G33 hw. Signed-off-by: Dave Airlie <[email protected]>
2010-12-21drm/radeon: Add early unregister of firmware fb'sBenjamin Herrenschmidt1-0/+19
Without this, we attempt the handover too late, the firmware fb might be accessing the chip simultaneously to us re-initializing various parts of it, which might frighten babies or cause all sort of nasty psychologic trauma to kitten. Signed-off-by: Benjamin Herrenschmidt <[email protected]> [danvet: add cc: stable, forward ported and compile-fixed for X86] Signed-off-by: Daniel Vetter <[email protected]> [airlied: move to even earlier in module load.] Signed-off-by: Dave Airlie <[email protected]>
2010-12-20net_sched: sch_sfq: fix allot handlingEric Dumazet1-12/+8
When deploying SFQ/IFB here at work, I found the allot management was pretty wrong in sfq, even changing allot from short to int... We should init allot for each new flow, not using a previous value found in slot. Before patch, I saw bursts of several packets per flow, apparently denying the default "quantum 1514" limit I had on my SFQ class. class sfq 11:1 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 7p requeues 0 allot 11546 class sfq 11:46 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 1p requeues 0 allot -23873 class sfq 11:78 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 5p requeues 0 allot 11393 After patch, better fairness among each flow, allot limit being respected, allot is positive : class sfq 11:e parent 11: (dropped 0, overlimits 0 requeues 86) backlog 0b 3p requeues 86 allot 596 class sfq 11:94 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 3p requeues 0 allot 1468 class sfq 11:a4 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 4p requeues 0 allot 650 class sfq 11:bb parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 3p requeues 0 allot 596 Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-21drm/nv50: add missing license header to nv50_fbcon.cBen Skeggs1-0/+24
Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nv50: fix smatch warning in nv50_vram.cBen Skeggs1-1/+2
Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-12-21drm/nouveau: sizeof() vs ARRAY_SIZE()Dan Carpenter1-1/+1
ARRAY_SIZE() was intended here, sizeof() is too large. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2010-12-20hostap: remove netif_stop_queue from initMeelis Roos1-1/+0
Fix runtime warning with backtrace from hostap by removing netif_stop_queue() call before register_netdev. Tested to work fine on hostap_pci Prism 2.5. (This removes a warning about calling netif_stop_queue before register_netdev is called. -- JWL) Signed-off-by: Meelis Roos <[email protected]> Acked-by: David S. Miller <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-12-20mac80211/rt2x00: add ieee80211_tx_status_ni()Johannes Stezenbach4-7/+32
All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from a workqueue, which causes "NOHZ: local_softirq_pending 08" messages. To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni() which can be called from process context, and call it from rt2x00lib_txdone(). For the rt2800pci special case a driver flag is introduced. https://bugzilla.kernel.org/show_bug.cgi?id=24892 Signed-off-by: Johannes Stezenbach <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-12-20typhoon: memory corruption in typhoon_get_drvinfo()Dan Carpenter1-1/+0
info->version only has space for 32 characters but my UTS_RELEASE is "2.6.37-rc6-next-20101217-05817-ge935fc8-dirty" so it doesn't fit. This is supposed to be the version of the driver, not the kernel version. This driver doesn't have a version so lets just leave it blank. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.