Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: add GET_PARAM/INFO support for Z pipes drm/radeon/kms: add r100/r200 OQ support. drm: Fix sysfs device confusion. drm/radeon/kms: implement the bo busy ioctl properly.
Showing
- drivers/gpu/drm/drm_sysfs.c 29 additions, 22 deletionsdrivers/gpu/drm/drm_sysfs.c
- drivers/gpu/drm/radeon/r100.c 10 additions, 0 deletionsdrivers/gpu/drm/radeon/r100.c
- drivers/gpu/drm/radeon/r300.c 3 additions, 1 deletiondrivers/gpu/drm/radeon/r300.c
- drivers/gpu/drm/radeon/r420.c 12 additions, 1 deletiondrivers/gpu/drm/radeon/r420.c
- drivers/gpu/drm/radeon/r520.c 0 additions, 1 deletiondrivers/gpu/drm/radeon/r520.c
- drivers/gpu/drm/radeon/radeon.h 1 addition, 0 deletionsdrivers/gpu/drm/radeon/radeon.h
- drivers/gpu/drm/radeon/radeon_cp.c 9 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_cp.c
- drivers/gpu/drm/radeon/radeon_drv.h 4 additions, 1 deletiondrivers/gpu/drm/radeon/radeon_drv.h
- drivers/gpu/drm/radeon/radeon_gem.c 1 addition, 1 deletiondrivers/gpu/drm/radeon/radeon_gem.c
- drivers/gpu/drm/radeon/radeon_kms.c 4 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_kms.c
- drivers/gpu/drm/radeon/radeon_reg.h 5 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_reg.h
- drivers/gpu/drm/radeon/radeon_state.c 3 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_state.c
- include/drm/radeon_drm.h 4 additions, 0 deletionsinclude/drm/radeon_drm.h
Loading
Please register or sign in to comment