linux/drivers/gpu/drm/vmwgfx
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
Makefile drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
svga3d_reg.h
svga_escape.h
svga_overlay.h
svga_reg.h
svga_types.h
vmwgfx_buffer.c
vmwgfx_drv.c Merge branch 'drm-platform' into drm-testing 2010-07-07 18:37:35 +10:00
vmwgfx_drv.h drm: move ttm global code to core drm 2010-08-04 09:46:06 +10:00
vmwgfx_execbuf.c drm/vmwgfx: return -EFAULT for copy_to_user errors 2010-06-08 09:33:41 +10:00
vmwgfx_fb.c drm/vmgfx: operation on ‘par->dirty.y1’ may be undefined 2010-08-02 10:12:21 +10:00
vmwgfx_fence.c drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
vmwgfx_fifo.c drm/vmwgfx: Support older hardware. 2010-06-01 09:37:25 +10:00
vmwgfx_gmr.c
vmwgfx_ioctl.c
vmwgfx_irq.c drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
vmwgfx_kms.c drm: Propagate error code from fb_create() 2010-08-10 10:46:51 +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: expand gamma_set 2010-08-10 10:47:00 +10:00
vmwgfx_overlay.c drm/vmwgfx: Unpause overlay on update. 2010-06-01 09:37:47 +10:00
vmwgfx_reg.h
vmwgfx_resource.c Merge branch 'master' into for-next 2010-06-16 18:08:13 +02:00
vmwgfx_ttm_glue.c drm: move ttm global code to core drm 2010-08-04 09:46:06 +10:00