kevin/linux
1
Fork 0
Code
008d23e485
linux/drivers/gpu/drm/nouveau
History
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
Kconfig drm/nouveau: Only select ACPI_VIDEO if its dependencies are met 2010-12-27 10:40:47 +10:00
Makefile drm/nvc0: implement fbcon acceleration 2010-12-21 17:18:39 +10:00
nouveau_acpi.c nouveau/acpi: improve detection of what is IGD and what is DIS. 2011-01-05 13:43:32 +10:00
nouveau_backlight.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
nouveau_bios.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
nouveau_bios.h drm/nouveau: make bios code easier to use externally 2010-09-24 16:26:56 +10:00
nouveau_bo.c drm/nvc0: accelerate ttm buffer moves 2010-12-21 17:18:44 +10:00
nouveau_calc.c drm/nouveau: make the behaviour of get_pll_limits() consistent 2010-09-24 16:26:49 +10:00
nouveau_channel.c drm/nouveau: create grctx on the fly on all chipsets 2011-01-07 14:03:58 +10:00
nouveau_connector.c drm/nv50: rework PGPIO IRQ handling and hotplug detection 2010-12-03 15:11:45 +10:00
nouveau_connector.h drm/nouveau: Use "force" to decide if analog load detection is ok or not. 2010-11-18 14:38:41 +10:00
nouveau_crtc.h drm/nouveau: allow cursor image and position to survive suspend 2010-05-28 16:06:17 +10:00
nouveau_debugfs.c drm/nouveau: add debugfs file to forcibly evict everything from vram 2010-09-24 16:28:33 +10:00
nouveau_display.c drm/nouveau: Implement the pageflip ioctl. 2010-12-03 15:11:12 +10:00
nouveau_dma.c drm/nvc0: fix channel dma init paths 2010-12-21 17:17:34 +10:00
nouveau_dma.h drm/nvc0: initial support for tiled buffer objects 2010-12-21 17:18:42 +10:00
nouveau_dp.c drm/nv50: rework PGPIO IRQ handling and hotplug detection 2010-12-03 15:11:45 +10:00
nouveau_drv.c drm/switcheroo: track state of switch in drivers. 2011-01-05 13:45:30 +10:00
nouveau_drv.h Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next 2011-01-10 09:23:49 +10:00
nouveau_encoder.h drm/nouveau: enable enhanced framing only if DP display supports it 2010-10-05 09:57:35 +10:00
nouveau_fb.h drm/fb: fix fbdev object model + cleanup properly. 2010-04-07 10:21:03 +10:00
nouveau_fbcon.c drm: Update fbdev fb_fix_screeninfo 2011-01-07 13:44:40 +10:00
nouveau_fbcon.h drm/nvc0: implement fbcon acceleration 2010-12-21 17:18:39 +10:00
nouveau_fence.c drm/nvc0: reserve only subc 0 for kernel use 2010-12-30 11:55:07 +10:00
nouveau_gem.c drm/nouveau: kick vram functions out into an "engine" 2010-12-08 13:48:20 +10:00
nouveau_grctx.h drm/nouveau: modify object accessors, offset in bytes rather than dwords 2010-09-24 16:20:00 +10:00
nouveau_hw.c drm/nouveau: introduce a util function to wait on reg != val 2010-12-08 03:00:36 +01:00
nouveau_hw.h drm/nv04: Fix scanout over the 16MB mark. 2010-11-18 14:38:38 +10:00
nouveau_i2c.c drm/nouveau: Fix a few confusions between "chipset" and "card_type". 2010-11-18 14:39:04 +10:00
nouveau_i2c.h Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2010-10-26 18:57:59 -07:00
nouveau_ioc32.c drm: convert drm_ioctl to unlocked_ioctl 2009-12-18 11:22:31 +10:00
nouveau_irq.c drm/nouveau: tidy+move PGRAPH ISRs to their respective *_graph.c files 2010-12-03 15:11:41 +10:00
nouveau_mem.c drm/nvc0: initial vm implementation, use for bar1/bar3 management 2010-12-21 17:17:14 +10:00
nouveau_mm.c drm/nv50: implement custom vram mm 2010-12-08 13:48:07 +10:00
nouveau_mm.h drm/nvc0: initial vm implementation, use for bar1/bar3 management 2010-12-21 17:17:14 +10:00
nouveau_notifier.c drm/nvc0: reject the notifier_alloc ioctl 2010-12-21 17:17:23 +10:00
nouveau_object.c drm/nouveau: create grctx on the fly on all chipsets 2011-01-07 14:03:58 +10:00
nouveau_perf.c drm/nouveau: parse voltage from perf 0x40 entires 2010-10-05 09:59:39 +10:00
nouveau_pm.c drm/nouveau: fix hwmon device binding 2011-01-07 23:22:17 +10:00
nouveau_pm.h drm/nva3: split pm backend out from nv50 2010-10-05 09:57:54 +10:00
nouveau_ramht.c drm/nv04-nv40: Give "gpuobj->cinst" the same meaning as on nv50. 2010-12-08 03:00:09 +01:00
nouveau_ramht.h drm/nouveau: return error from nouveau_ramht_remove() if not found 2010-12-03 15:05:27 +10:00
nouveau_reg.h drm/nouveau: tidy up and extend dma object creation interfaces 2010-12-03 15:11:59 +10:00
nouveau_sgdma.c drm/nv04-nv40: Fix up PCI(E) GART DMA object bus address calculation. 2010-12-08 15:53:04 +10:00
nouveau_state.c drm/switcheroo: track state of switch in drivers. 2011-01-05 13:45:30 +10:00
nouveau_temp.c drm/nouveau: Fix a few confusions between "chipset" and "card_type". 2010-11-18 14:39:04 +10:00
nouveau_ttm.c drm: move ttm global code to core drm 2010-08-04 09:46:06 +10:00
nouveau_util.c drm/nouveau: move bitfield/enum helpers to nouveau_util.c 2010-12-03 15:11:36 +10:00
nouveau_util.h drm/nouveau: move bitfield/enum helpers to nouveau_util.c 2010-12-03 15:11:36 +10:00
nouveau_vm.c drm/nvc0: import initial vm backend 2010-12-21 17:17:09 +10:00
nouveau_vm.h drm/nvc0: import initial vm backend 2010-12-21 17:17:09 +10:00
nouveau_volt.c drm/nouveau: fix thinko in volt 0x1x parsing 2010-09-24 16:27:58 +10:00
nv04_crtc.c drm/nouveau: Call drm_vblank_pre/post_modeset() around mode setting. 2010-12-03 15:11:14 +10:00
nv04_cursor.c drm/nouveau: allow cursor image and position to survive suspend 2010-05-28 16:06:17 +10:00
nv04_dac.c drm/nouveau: introduce a util function to wait on reg != val 2010-12-08 03:00:36 +01:00
nv04_dfp.c drm/nv04-nv40: Fall back to panel rescaling if we have no usable native mode. 2010-11-18 14:38:15 +10:00
nv04_display.c drm/nv04-nv40: unregister irq handler on destroy 2010-12-03 15:11:43 +10:00
nv04_fb.c
nv04_fbcon.c drm/nouveau: implicitly insert non-DMA objects into RAMHT 2010-12-08 03:00:35 +01:00
nv04_fifo.c drm/nouveau: make fifo.create_context() responsible for mapping control regs 2010-12-08 03:00:34 +01:00
nv04_graph.c drm/nv04-nv10: Don't re-enable FIFO access multiple times after IRQ dispatch. 2010-12-08 03:00:20 +01:00
nv04_instmem.c drm/nouveau: rework gpu-specific instmem interfaces 2010-12-03 15:11:48 +10:00
nv04_mc.c drm/nouveau: Disable PROM access on init. 2010-07-13 10:13:58 +10:00
nv04_pm.c drm/nv10-nv20: Fix instability after MPLL changes. 2010-11-18 14:38:47 +10:00
nv04_timer.c
nv04_tv.c drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD. 2010-10-05 09:58:43 +10:00
nv10_fb.c drm/nv20: Add Z compression support. 2010-12-03 15:11:21 +10:00
nv10_fifo.c drm/nouveau: make fifo.create_context() responsible for mapping control regs 2010-12-08 03:00:34 +01:00
nv10_gpio.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv10_graph.c drm/nv04-nv10: Don't re-enable FIFO access multiple times after IRQ dispatch. 2010-12-08 03:00:20 +01:00
nv17_tv_modes.c drm/nouveau: Break some long lines in the TV-out code. 2010-09-24 16:24:59 +10:00
nv17_tv.c drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD. 2010-10-05 09:58:43 +10:00
nv17_tv.h drm/nouveau: Break some long lines in the TV-out code. 2010-09-24 16:24:59 +10:00
nv20_graph.c drm/nouveau: tidy+move PGRAPH ISRs to their respective *_graph.c files 2010-12-03 15:11:41 +10:00
nv30_fb.c drm/nouveau: Rework tile region handling. 2010-12-03 15:11:20 +10:00
nv40_fb.c drm/nouveau: Rework tile region handling. 2010-12-03 15:11:20 +10:00
nv40_fifo.c drm/nouveau: create grctx on the fly on all chipsets 2011-01-07 14:03:58 +10:00
nv40_graph.c drm/nouveau: create grctx on the fly on all chipsets 2011-01-07 14:03:58 +10:00
nv40_grctx.c drm/nouveau: modify object accessors, offset in bytes rather than dwords 2010-09-24 16:20:00 +10:00
nv40_mc.c drm/nouveau: Add some PFB register defines. 2010-07-26 11:42:13 +10:00
nv50_calc.c drm/nva3: fix overflow in fixed point math used for pll calculation 2010-11-18 14:38:34 +10:00
nv50_crtc.c drm/nvc0: initial support for tiled buffer objects 2010-12-21 17:18:42 +10:00
nv50_cursor.c drm/nouveau: Remove implicit argument from nv_wait(). 2010-09-24 16:25:36 +10:00
nv50_dac.c drm/nouveau: Remove implicit argument from nv_wait(). 2010-09-24 16:25:36 +10:00
nv50_display.c drm/nv50: rework PGPIO IRQ handling and hotplug detection 2010-12-03 15:11:45 +10:00
nv50_display.h drm/nv50: rework PGPIO IRQ handling and hotplug detection 2010-12-03 15:11:45 +10:00
nv50_evo.c drm/nvc0: initial support for tiled buffer objects 2010-12-21 17:18:42 +10:00
nv50_evo.h drm/nv50: move evo handling to nv50_evo.c 2010-12-03 15:10:52 +10:00
nv50_fb.c drm/nv50: fix 0x100c90 init for NVAF 2010-12-03 15:11:52 +10:00
nv50_fbcon.c drm/nv50: add missing license header to nv50_fbcon.c 2010-12-21 06:14:37 +10:00
nv50_fifo.c drm/nv50: import new vm code 2010-12-08 13:48:10 +10:00
nv50_gpio.c drm/nv50: rework PGPIO IRQ handling and hotplug detection 2010-12-03 15:11:45 +10:00
nv50_graph.c drm/nv50: sync up gr data error names with rnn, use for nvc0 also 2010-12-30 11:48:03 +10:00
nv50_grctx.c drm/nv50: demagic grctx, and add NVAF support 2010-09-24 16:24:00 +10:00
nv50_instmem.c drm/nouveau: modify vm to accomodate dual page tables for nvc0 2010-12-21 17:17:01 +10:00
nv50_mc.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv50_pm.c drm/nva3: split pm backend out from nv50 2010-10-05 09:57:54 +10:00
nv50_sor.c drm/nouveau: Remove implicit argument from nv_wait(). 2010-09-24 16:25:36 +10:00
nv50_vm.c drm/nouveau: modify vm to accomodate dual page tables for nvc0 2010-12-21 17:17:01 +10:00
nv50_vram.c drm/nouveau: sizeof() vs ARRAY_SIZE() 2010-12-21 11:53:32 +10:00
nv84_crypt.c drm/nv50: implement global channel address space on new VM code 2010-12-08 13:48:13 +10:00
nva3_pm.c drm/nva3: split pm backend out from nv50 2010-10-05 09:57:54 +10:00
nvc0_fb.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nvc0_fbcon.c drm/nvc0: nuke left-over debug messages 2010-12-29 10:51:34 +10:00
nvc0_fifo.c drm/nvc0/pfifo: support for chipsets with only one PSUBFIFO (0xc1) 2010-12-31 12:11:50 +10:00
nvc0_graph.c drm/nvc0: fix init without firmware present 2011-01-06 22:10:15 +10:00
nvc0_graph.h drm/nvc0: kill off a couple more magics 2010-12-29 10:51:27 +10:00
nvc0_grctx.c drm/nvc0/pgraph: fix 0x406028/0x405870 init 2011-01-01 12:26:23 +10:00
nvc0_instmem.c drm/nvc0: create shared channel vm 2010-12-21 17:17:21 +10:00
nvc0_vm.c drm/nvc0: import initial vm backend 2010-12-21 17:17:09 +10:00
nvc0_vram.c drm/nvc0: initial support for tiled buffer objects 2010-12-21 17:18:42 +10:00
nvreg.h drm/nv04: Make CRTC base changes effective in the next hsync. 2010-12-03 15:11:09 +10:00