linux/drivers/gpu/drm/vmwgfx
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/vmwgfx: depends on FB 2010-03-15 10:35:04 +10:00
Makefile vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
svga3d_reg.h
svga_escape.h
svga_overlay.h
svga_reg.h
svga_types.h
vmwgfx_buffer.c vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_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
vmwgfx_drv.h vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_execbuf.c vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_fb.c vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_fence.c drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
vmwgfx_fifo.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
vmwgfx_gmr.c vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_gmrid_manager.c vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_ioctl.c drm/vmwgfx: Add a parameter to get the max fb size 2010-10-06 11:29:58 +10:00
vmwgfx_irq.c drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
vmwgfx_kms.c drm/vmwgfx: Save at least one screen layout 2010-10-06 11:30:05 +10:00
vmwgfx_kms.h drm/vmwgfx: Allow userspace to change default layout. Bump minor. 2010-06-03 13:13:36 +10:00
vmwgfx_ldu.c drm/vmwgfx: Prune modes based on available VRAM size 2010-10-06 11:29:51 +10:00
vmwgfx_overlay.c drm/vmwgfx: Unpause overlay on update. 2010-06-01 09:37:47 +10:00
vmwgfx_reg.h drm/vmwgfx: Add DRM driver for VMware Virtual GPU 2009-12-15 08:38:43 +10:00
vmwgfx_resource.c vmwgfx: Implement a proper GMR eviction mechanism 2010-10-27 11:07:46 +10:00
vmwgfx_ttm_glue.c drivers/gpu/drm: Remove unnecessary casts of private_data 2010-09-23 13:35:26 +02:00