Commit c07d7237a639d57dc91ea7efdbc1b3f85c7a095d
Exists in
master
and in
7 other branches
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (45 commits) drm/nv04: Fix set_operation software method. drm/nouveau: initialise DMA tracking parameters earlier drm/nouveau: use dma.max rather than pushbuf size for checking GET validity drm/nv04: differentiate between nv04/nv05 drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence drm/nv50: prevent a possible ctxprog hang drm/nouveau: have ttm's fault handler called directly drm/nv50: restore correct cache1 get/put address on fifoctx load drm/nouveau: create function for "dealing" with gpu lockup drm/nouveau: remove unused nouveau_channel_idle() function drm/nouveau: fix handling of fbcon colours in 8bpp drm/nv04: Context switching fixes. drm/nouveau: Use the software object for fencing. drm/nouveau: Allocate a per-channel instance of NV_SW. drm/nv50: make the blocksize depend on vram size drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN drm/nouveau: Don't skip card take down on nv0x. drm/nouveau: Implement nv42-nv43 TV load detection. drm/nouveau: Clean up the nv17-nv4x load detection code a bit. drm/nv50: fix fillrect color ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 65 changed files Side-by-side Diff
- drivers/gpu/drm/drm_crtc.c
- drivers/gpu/drm/drm_crtc_helper.c
- drivers/gpu/drm/drm_fb_helper.c
- drivers/gpu/drm/drm_irq.c
- drivers/gpu/drm/nouveau/Kconfig
- drivers/gpu/drm/nouveau/nouveau_bo.c
- drivers/gpu/drm/nouveau/nouveau_channel.c
- drivers/gpu/drm/nouveau/nouveau_dma.c
- drivers/gpu/drm/nouveau/nouveau_dma.h
- drivers/gpu/drm/nouveau/nouveau_drv.h
- drivers/gpu/drm/nouveau/nouveau_fbcon.c
- drivers/gpu/drm/nouveau/nouveau_fbcon.h
- drivers/gpu/drm/nouveau/nouveau_fence.c
- drivers/gpu/drm/nouveau/nouveau_gem.c
- drivers/gpu/drm/nouveau/nouveau_irq.c
- drivers/gpu/drm/nouveau/nouveau_mem.c
- drivers/gpu/drm/nouveau/nouveau_object.c
- drivers/gpu/drm/nouveau/nouveau_reg.h
- drivers/gpu/drm/nouveau/nouveau_state.c
- drivers/gpu/drm/nouveau/nouveau_ttm.c
- drivers/gpu/drm/nouveau/nv04_dac.c
- drivers/gpu/drm/nouveau/nv04_fbcon.c
- drivers/gpu/drm/nouveau/nv04_fifo.c
- drivers/gpu/drm/nouveau/nv04_graph.c
- drivers/gpu/drm/nouveau/nv10_fb.c
- drivers/gpu/drm/nouveau/nv10_graph.c
- drivers/gpu/drm/nouveau/nv17_tv.c
- drivers/gpu/drm/nouveau/nv20_graph.c
- drivers/gpu/drm/nouveau/nv40_fb.c
- drivers/gpu/drm/nouveau/nv40_graph.c
- drivers/gpu/drm/nouveau/nv50_display.c
- drivers/gpu/drm/nouveau/nv50_fbcon.c
- drivers/gpu/drm/nouveau/nv50_fifo.c
- drivers/gpu/drm/radeon/Makefile
- drivers/gpu/drm/radeon/ObjectID.h
- drivers/gpu/drm/radeon/atombios_dp.c
- drivers/gpu/drm/radeon/mkregtable.c
- drivers/gpu/drm/radeon/r100.c
- drivers/gpu/drm/radeon/r300.c
- drivers/gpu/drm/radeon/r420.c
- drivers/gpu/drm/radeon/r520.c
- drivers/gpu/drm/radeon/r600.c
- drivers/gpu/drm/radeon/r600_blit_kms.c
- drivers/gpu/drm/radeon/radeon.h
- drivers/gpu/drm/radeon/radeon_agp.c
- drivers/gpu/drm/radeon/radeon_asic.h
- drivers/gpu/drm/radeon/radeon_atombios.c
- drivers/gpu/drm/radeon/radeon_combios.c
- drivers/gpu/drm/radeon/radeon_connectors.c
- drivers/gpu/drm/radeon/radeon_display.c
- drivers/gpu/drm/radeon/radeon_encoders.c
- drivers/gpu/drm/radeon/radeon_gem.c
- drivers/gpu/drm/radeon/radeon_irq_kms.c
- drivers/gpu/drm/radeon/radeon_legacy_tv.c
- drivers/gpu/drm/radeon/radeon_mode.h
- drivers/gpu/drm/radeon/radeon_object.c
- drivers/gpu/drm/radeon/reg_srcs/r420
- drivers/gpu/drm/radeon/reg_srcs/rs600
- drivers/gpu/drm/radeon/reg_srcs/rv515
- drivers/gpu/drm/radeon/rs400.c
- drivers/gpu/drm/radeon/rs600.c
- drivers/gpu/drm/radeon/rs690.c
- drivers/gpu/drm/radeon/rv515.c
- drivers/gpu/drm/radeon/rv770.c
- include/drm/drm_mode.h