Merge branch 'drm-radeon-kms' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-radeon-kms' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (35 commits) drm/radeon: set fb aperture sizes for framebuffer handoff. drm/ttm: fix highuser vs dma32 confusion. drm/radeon: Fix size used for benchmarking BO copies. drm/radeon: Add radeon.test parameter for running BO GPU copy tests. drm/radeon/kms: allow interruptible waits for objects. drm/ttm: powerpc: Fix Highmem cache flushing. x86: Export kmap_atomic_prot() needed for TTM. drm/ttm: Fix ttm in-kernel copying of pages with non-standard caching attributes. drm/ttm: Fix an oops and sync object leak. drm/radeon/kms: vram sizing on certain r100 chips needs workaround. drm/radeon: Pay more attention to object placement requested by userspace. drm/radeon: Fall back to evicting BOs with memcpy if necessary. drm/radeon: Don't unreserve twice on failure to validate. drm/radeon/kms: fix bandwidth computation on avivo hardware drm/radeon/kms: add initial colortiling support. drm/radeon/kms: fix hotspot handling on pre-avivo chips drm/radeon/kms: enable frac fb divs on rs600/rs690/rs740 drm/radeon/kms: add PLL flag to prefer frequencies <= the target freq drm/radeon/kms: block RN50 from using 3D engine. drm/radeon/kms: fix VRAM sizing like DDX does it. ...
No related branches found
No related tags found
Showing
- arch/x86/mm/highmem_32.c 1 addition, 0 deletionsarch/x86/mm/highmem_32.c
- drivers/gpu/drm/radeon/Makefile 2 additions, 1 deletiondrivers/gpu/drm/radeon/Makefile
- drivers/gpu/drm/radeon/atombios_crtc.c 146 additions, 147 deletionsdrivers/gpu/drm/radeon/atombios_crtc.c
- drivers/gpu/drm/radeon/r100.c 757 additions, 13 deletionsdrivers/gpu/drm/radeon/r100.c
- drivers/gpu/drm/radeon/r300.c 70 additions, 8 deletionsdrivers/gpu/drm/radeon/r300.c
- drivers/gpu/drm/radeon/r300_reg.h 3 additions, 1 deletiondrivers/gpu/drm/radeon/r300_reg.h
- drivers/gpu/drm/radeon/r500_reg.h 2 additions, 0 deletionsdrivers/gpu/drm/radeon/r500_reg.h
- drivers/gpu/drm/radeon/r520.c 17 additions, 5 deletionsdrivers/gpu/drm/radeon/r520.c
- drivers/gpu/drm/radeon/r600.c 3 additions, 2 deletionsdrivers/gpu/drm/radeon/r600.c
- drivers/gpu/drm/radeon/radeon.h 82 additions, 5 deletionsdrivers/gpu/drm/radeon/radeon.h
- drivers/gpu/drm/radeon/radeon_asic.h 32 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_asic.h
- drivers/gpu/drm/radeon/radeon_atombios.c 6 additions, 3 deletionsdrivers/gpu/drm/radeon/radeon_atombios.c
- drivers/gpu/drm/radeon/radeon_benchmark.c 2 additions, 2 deletionsdrivers/gpu/drm/radeon/radeon_benchmark.c
- drivers/gpu/drm/radeon/radeon_cs.c 7 additions, 1 deletiondrivers/gpu/drm/radeon/radeon_cs.c
- drivers/gpu/drm/radeon/radeon_cursor.c 7 additions, 2 deletionsdrivers/gpu/drm/radeon/radeon_cursor.c
- drivers/gpu/drm/radeon/radeon_device.c 37 additions, 22 deletionsdrivers/gpu/drm/radeon/radeon_device.c
- drivers/gpu/drm/radeon/radeon_display.c 47 additions, 27 deletionsdrivers/gpu/drm/radeon/radeon_display.c
- drivers/gpu/drm/radeon/radeon_drv.c 4 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_drv.c
- drivers/gpu/drm/radeon/radeon_encoders.c 2 additions, 357 deletionsdrivers/gpu/drm/radeon/radeon_encoders.c
- drivers/gpu/drm/radeon/radeon_fb.c 64 additions, 6 deletionsdrivers/gpu/drm/radeon/radeon_fb.c
Loading
Please register or sign in to comment