OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2aaf2092c1
linux/drivers/gpu/drm/nouveau
History
Linus Torvalds aa9f56b66d Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 
* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)
  io-mapping: move asm include inside the config option
  vgaarb: drop vga.h include
  drm/radeon: Add probing of clocks from device-tree
  drm/radeon: drop old and broken mesa warning
  drm/radeon: Fix pci_map_page() error checking
  drm: Remove count_lock for calling lastclose() after 58474713 (v2)
  drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx
  drm/radeon/kms: another r6xx/r7xx CS checker fix
  DRM: Replace kmalloc/memset combos with kzalloc
  drm: expand gamma_set
  drm/edid: Split mode lists out to their own header for readability
  drm/edid: Rewrite mode parse to use the generic detailed block walk
  drm/edid: Add detailed block walk for VTB extensions
  drm/edid: Add detailed block walk for CEA extensions
  drm: Remove unused fields from drm_display_info
  drm: Use ENOENT consistently for the error return for an unmatched handle.
  drm/radeon/kms: mark 3D power states as performance
  drm: Only set DPMS once on the CRTC not after every encoder.
  drm/radeon/kms: add additional quirk for Acer rv620 laptop
  drm: Propagate error code from fb_create()
  ...

Fix up trivial conflicts in drivers/gpu/drm/drm_edid.c
2010-08-12 09:21:39 -07:00
..
Kconfig drm: Import driver for the sil164 I2C TMDS transmitter. 2010-08-02 10:21:13 +10:00
Makefile drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nouveau_acpi.c drm/nouveau: support fetching LVDS EDID from ACPI 2010-07-26 11:41:45 +10:00
nouveau_backlight.c
nouveau_bios.c drm/nouveau: Fix DCB TMDS config parsing. 2010-08-09 15:17:02 +10:00
nouveau_bios.h drm/nv17-nv4x: Attempt to init some external TMDS transmitters. 2010-08-06 08:34:59 +10:00
nouveau_bo.c drm/nouveau: remove unused ttm bo list 2010-08-06 08:33:41 +10:00
nouveau_calc.c drm/nouveau: Add some PFB register defines. 2010-07-26 11:42:13 +10:00
nouveau_channel.c drm/nouveau: reduce usage of fence spinlock to when absolutely necessary 2010-07-13 10:14:04 +10:00
nouveau_connector.c drm/nv17-nv4x: Attempt to init some external TMDS transmitters. 2010-08-06 08:34:59 +10:00
nouveau_connector.h
nouveau_crtc.h
nouveau_debugfs.c
nouveau_display.c drm: Propagate error code from fb_create() 2010-08-10 10:46:51 +10:00
nouveau_dma.c
nouveau_dma.h
nouveau_dp.c drm/nv50: use custom i2c algo for dp auxch 2010-08-06 08:33:40 +10:00
nouveau_drv.c drm/nouveau: Move display init to a new nouveau_engine. 2010-07-26 11:43:36 +10:00
nouveau_drv.h drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nouveau_encoder.h drm/nv17-nv4x: Attempt to init some external TMDS transmitters. 2010-08-06 08:34:59 +10:00
nouveau_fb.h
nouveau_fbcon.c Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2010-08-12 09:21:39 -07:00
nouveau_fbcon.h
nouveau_fence.c drm/nouveau: set TASK_(UN)INTERRUPTIBLE before schedule_timeout() 2010-08-02 10:12:26 +10:00
nouveau_gem.c drm: Use ENOENT consistently for the error return for an unmatched handle. 2010-08-10 10:46:55 +10:00
nouveau_grctx.h
nouveau_hw.c drm/nv17-nv4x: Attempt to init some external TMDS transmitters. 2010-08-06 08:34:59 +10:00
nouveau_hw.h
nouveau_i2c.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nouveau_i2c.h drm/nv50: use custom i2c algo for dp auxch 2010-08-06 08:33:40 +10:00
nouveau_ioc32.c
nouveau_irq.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nouveau_mem.c drm/nvc0: implement memory detection 2010-08-06 08:35:24 +10:00
nouveau_notifier.c
nouveau_object.c drm/nouveau: allocate fixed amount of PRAMIN per channel on all chipsets 2010-07-13 10:13:44 +10:00
nouveau_reg.h drm/nv10: Fix up switching of NV10TCL_DMA_VTXBUF. 2010-08-06 08:34:51 +10:00
nouveau_sgdma.c drm/nv50: move tlb flushing to a helper function 2010-07-13 10:13:41 +10:00
nouveau_state.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nouveau_ttm.c drm: move ttm global code to core drm 2010-08-04 09:46:06 +10:00
nv04_crtc.c drm: expand gamma_set 2010-08-10 10:47:00 +10:00
nv04_cursor.c
nv04_dac.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv04_dfp.c drm/nv30: Workaround dual TMDS brain damage. 2010-08-06 08:35:11 +10:00
nv04_display.c drm/nouveau: Fix TV-out detection on unposted cards lacking a usable DCB table. 2010-07-26 11:43:48 +10:00
nv04_fb.c
nv04_fbcon.c
nv04_fifo.c drm/nv04: Enable context switching on PFIFO init. 2010-07-13 10:14:00 +10:00
nv04_graph.c drm/nouveau: reduce usage of fence spinlock to when absolutely necessary 2010-07-13 10:14:04 +10:00
nv04_instmem.c drm/nouveau: add instmem flush() hook 2010-07-13 10:13:40 +10:00
nv04_mc.c drm/nouveau: Disable PROM access on init. 2010-07-13 10:13:58 +10:00
nv04_timer.c
nv04_tv.c drm/nouveau: No need to set slave TV encoder configs explicitly. 2010-08-06 08:35:06 +10:00
nv10_fb.c
nv10_fifo.c drm/nouveau: add instmem flush() hook 2010-07-13 10:13:40 +10:00
nv10_gpio.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv10_graph.c drm/nv10: Fix up switching of NV10TCL_DMA_VTXBUF. 2010-08-06 08:34:51 +10:00
nv17_tv_modes.c
nv17_tv.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv17_tv.h
nv20_graph.c drm/nv20-nv30: move context table object out of dev_priv 2010-07-13 10:13:50 +10:00
nv30_fb.c drm/nv30: Fix PFB init for nv31. 2010-08-09 15:16:37 +10:00
nv40_fb.c
nv40_fifo.c drm/nouveau: add instmem flush() hook 2010-07-13 10:13:40 +10:00
nv40_graph.c drm/nouveau: remove ability to use external firmware 2010-07-13 10:13:43 +10:00
nv40_grctx.c
nv40_mc.c drm/nouveau: Add some PFB register defines. 2010-07-26 11:42:13 +10:00
nv50_calc.c
nv50_crtc.c drm: expand gamma_set 2010-08-10 10:47:00 +10:00
nv50_cursor.c
nv50_dac.c
nv50_display.c drm/nvc0: fix evo dma object so we display something 2010-08-06 08:35:35 +10:00
nv50_display.h drm/nouveau: Move display init to a new nouveau_engine. 2010-07-26 11:43:36 +10:00
nv50_evo.h
nv50_fb.c
nv50_fbcon.c
nv50_fifo.c drm/nv50: fix RAMHT size 2010-07-13 10:14:02 +10:00
nv50_gpio.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv50_graph.c drm/nv50: cleanup nv50_fifo.c 2010-07-13 10:13:49 +10:00
nv50_grctx.c
nv50_instmem.c drm/nv50: correct wait condition for instmem flush 2010-07-26 11:43:52 +10:00
nv50_mc.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv50_sor.c
nvc0_fb.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nvc0_fifo.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nvc0_graph.c drm/nvc0: starting point for GF100 support, everything stubbed 2010-08-06 08:35:17 +10:00
nvc0_instmem.c drm/nvc0: fix typo in PRAMIN flush 2010-08-09 15:18:44 +10:00
nvreg.h drm/nouveau: Add some PFB register defines. 2010-07-26 11:42:13 +10:00