OpenCloudOS-Kernel/drivers/gpu/drm/nouveau
Linus Torvalds c48c43e422 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: (476 commits)
  vmwgfx: Implement a proper GMR eviction mechanism
  drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2
  drm/radeon/kms: properly compute group_size on 6xx/7xx
  drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker
  drm/radeon/kms/evergreen: set the clear state to the blit state
  drm/radeon/kms: don't poll dac load detect.
  gpu: Add Intel GMA500(Poulsbo) Stub Driver
  drm/radeon/kms: MC vram map needs to be >= pci aperture size
  drm/radeon/kms: implement display watermark support for evergreen
  drm/radeon/kms/evergreen: add some additional safe regs v2
  drm/radeon/r600: fix tiling issues in CS checker.
  drm/i915: Move gpu_write_list to per-ring
  drm/i915: Invalidate the to-ring, flush the old-ring when updating domains
  drm/i915/ringbuffer: Write the value passed in to the tail register
  agp/intel: Restore valid PTE bit for Sandybridge after bdd3072
  drm/i915: Fix flushing regression from 9af90d19f
  drm/i915/sdvo: Remove unused encoding member
  i915: enable AVI infoframe for intel_hdmi.c [v4]
  drm/i915: Fix current fb blocking for page flip
  drm/i915: IS_IRONLAKE is synonymous with gen == 5
  ...

Fix up conflicts in
 - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the
   new simplified stack-based kmap_atomic() interface
 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL
   removal cleanups.
2010-10-26 18:57:59 -07:00
..
Kconfig drm/nouveau: Fix build regression, undefined reference to `acpi_video_get_edid' 2010-09-24 16:27:40 +10:00
Makefile drm/nva3: split pm backend out from nv50 2010-10-05 09:57:54 +10:00
nouveau_acpi.c drm/nouveau: we can't free ACPI EDID, so make a copy that we can 2010-09-24 16:26:24 +10:00
nouveau_backlight.c backlight: Allow properties to be passed at registration 2010-03-16 19:47:54 +00:00
nouveau_bios.c 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_bios.h drm/nouveau: make bios code easier to use externally 2010-09-24 16:26:56 +10:00
nouveau_bo.c drm/ttm: restructure to allow driver to plug in alternate memory manager 2010-10-05 10:01:20 +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/ttm: restructure to allow driver to plug in alternate memory manager 2010-10-05 10:01:20 +10:00
nouveau_connector.c drm/nouveau: fix required mode bandwidth calculation for DP 2010-10-05 09:58:03 +10:00
nouveau_connector.h drm/nouveau: fix required mode bandwidth calculation for DP 2010-10-05 09:58:03 +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: Propagate error code from fb_create() 2010-08-10 10:46:51 +10:00
nouveau_dma.c drm/nouveau: Minor refactoring/cleanup of the fence code. 2010-10-05 09:58:59 +10:00
nouveau_dma.h drm/nouveau: Use semaphores to handle inter-channel sync in hardware. 2010-10-05 09:59:16 +10:00
nouveau_dp.c drm/nouveau: fix typo in c2aa91afea5f7e7ae4530fabd37414a79c03328c 2010-10-05 09:57:58 +10:00
nouveau_drv.c 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_drv.h drm/nv50: Fix large 3D performance regression caused by the interchannel sync patches. 2010-10-05 09:59:28 +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 Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next 2010-10-19 09:48:34 +10:00
nouveau_fbcon.h drm/fbdev: rework output polling to be back in the core. (v4) 2010-05-18 17:40:11 +10:00
nouveau_fence.c drm/nv50: Fix large 3D performance regression caused by the interchannel sync patches. 2010-10-05 09:59:28 +10:00
nouveau_gem.c Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-core-next 2010-10-06 12:57:11 +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/nv30-nv40: Fix postdivider mask when writing engine/memory PLLs. 2010-10-05 09:58:33 +10:00
nouveau_hw.h drm/nouveau: Add DRM driver for NVIDIA GPUs 2009-12-11 21:29:34 +10:00
nouveau_i2c.c drm/nouveau: Add support for I2C hardware monitoring devices. 2010-09-24 16:29:36 +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: handle fifo pusher errors better 2010-09-24 16:26:02 +10:00
nouveau_mem.c drm/nouveau: fix thinkos in mem timing table recordlen check 2010-10-05 09:59:43 +10:00
nouveau_notifier.c Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next 2010-10-19 09:48:34 +10:00
nouveau_object.c drm/nouveau: remove nouveau_gpuobj_late_takedown 2010-09-24 16:23:46 +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: pass perflvl struct to clock_pre() 2010-10-05 09:57:41 +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/nouveau: Don't remove ramht entries from the neighboring channels. 2010-09-24 16:25:03 +10:00
nouveau_ramht.h drm/nouveau: add spinlock around ramht modifications 2010-09-24 16:23:30 +10:00
nouveau_reg.h drm/nouveau: Simplify tile region handling. 2010-09-24 16:25:44 +10:00
nouveau_sgdma.c drm/ttm: restructure to allow driver to plug in alternate memory manager 2010-10-05 10:01:20 +10:00
nouveau_state.c drm/nouveau: Use semaphores to handle inter-channel sync in hardware. 2010-10-05 09:59:16 +10:00
nouveau_temp.c drm/nouveau: Misc cleanup of the PM code. 2010-09-24 16:29:41 +10:00
nouveau_ttm.c drm: move ttm global code to core drm 2010-08-04 09:46:06 +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, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum 2010-10-19 14:13:33 +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/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD. 2010-10-05 09:58:43 +10:00
nv04_dfp.c drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD. 2010-10-05 09:58:43 +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 drm/nouveau: Add DRM driver for NVIDIA GPUs 2009-12-11 21:29:34 +10:00
nv04_fbcon.c drm/nouveau: remove nouveau_gpuobj_ref completely, replace with sanity 2010-09-24 16:20:14 +10:00
nv04_fifo.c drm/nouveau: Simplify tile region handling. 2010-09-24 16:25:44 +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: PRAMIN is available from the start on pre-nv50. 2010-09-24 16:25:28 +10:00
nv04_mc.c drm/nouveau: Disable PROM access on init. 2010-07-13 10:13:58 +10:00
nv04_pm.c drm/nouveau: pass perflvl struct to clock_pre() 2010-10-05 09:57:41 +10:00
nv04_timer.c drm/nouveau: Add DRM driver for NVIDIA GPUs 2009-12-11 21:29:34 +10:00
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/nouveau: Pre-G80 tiling support. 2010-01-11 08:47:56 +10:00
nv10_fifo.c drm/nouveau: tidy ram{ht,fc,ro} a bit 2010-09-24 16:23:22 +10:00
nv10_gpio.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv10_graph.c drm/nv10: Don't oops if the card wants to switch to a channel with no grctx. 2010-09-24 16:28:56 +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
nv17_tv_modes.c drm/nouveau: Break some long lines in the TV-out code. 2010-09-24 16:24:59 +10:00
nv20_graph.c drm/nouveau: remove nouveau_gpuobj_ref completely, replace with sanity 2010-09-24 16:20:14 +10:00
nv30_fb.c drm/nv30: Fix PFB init for nv31. 2010-08-09 15:16:37 +10:00
nv40_fb.c drm/nouveau: Pre-G80 tiling support. 2010-01-11 08:47:56 +10:00
nv40_fifo.c drm/nouveau: tidy ram{ht,fc,ro} a bit 2010-09-24 16:23:22 +10:00
nv40_graph.c drm/nv50: allow gpuobjs that aren't mapped into aperture 2010-09-24 16:20:28 +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/nv50: support fractional feedback divider on newer chips 2010-05-19 16:21:59 +10:00
nv50_crtc.c drm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum 2010-10-19 14:13:33 +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/ttm: restructure to allow driver to plug in alternate memory manager 2010-10-05 10:01:20 +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 drm/nouveau: Add DRM driver for NVIDIA GPUs 2009-12-11 21:29:34 +10:00
nv50_fb.c drm/nv50: fix 100c90 write on nva3 2010-09-24 16:26:41 +10:00
nv50_fbcon.c drm/nouveau: remove nouveau_gpuobj_ref completely, replace with sanity 2010-09-24 16:20:14 +10:00
nv50_fifo.c drm/nouveau: tidy ram{ht,fc,ro} a bit 2010-09-24 16:23:22 +10:00
nv50_gpio.c drm/nouveau: introduce gpio engine 2010-07-26 11:43:57 +10:00
nv50_graph.c drm/nouveau: Remove implicit argument from nv_wait(). 2010-09-24 16:25:36 +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/ttm: restructure to allow driver to plug in alternate memory manager 2010-10-05 10:01:20 +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
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_fifo.c drm/nouveau: Simplify tile region handling. 2010-09-24 16:25:44 +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/ttm: restructure to allow driver to plug in alternate memory manager 2010-10-05 10:01:20 +10:00
nvreg.h drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD. 2010-10-05 09:58:43 +10:00