Commit 42be79e37e264557f12860fa4cc84b4de3685954
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: (76 commits) drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus. drm/radeon/kms: rs400/480 should set common registers. drm/radeon/kms: add sanity check to wptr. drm/radeon/kms/evergreen: get DP working drm/radeon/kms: add hw_i2c module option drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks drm/radeon/kms: disable MSI on IGP chips drm/radeon/kms: display watermark updates (v2) drm/radeon/kms/dp: disable training pattern on the sink at the end of link training drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2) drm/radeon/kms/dp: remove extraneous training complete call drm/radeon/kms/atom: minor fixes to transmitter setup drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM. drm: fix build error when SYSRQ is disabled drm/radeon/kms: fix macbookpro connector quirk drm/radeon/r6xx/r7xx: further safe reg clean up drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support drm/radeon/kms: bump the version for r6xx/r7xx const buffer support drm/radeon/r6xx/r7xx: CS parser fixes drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup ... Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c
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 76 changed files Side-by-side Diff
- drivers/gpu/drm/drm_crtc_helper.c
- drivers/gpu/drm/drm_edid.c
- drivers/gpu/drm/drm_fb_helper.c
- drivers/gpu/drm/drm_fops.c
- drivers/gpu/drm/nouveau/Makefile
- drivers/gpu/drm/nouveau/nouveau_bios.c
- drivers/gpu/drm/nouveau/nouveau_bios.h
- drivers/gpu/drm/nouveau/nouveau_bo.c
- drivers/gpu/drm/nouveau/nouveau_connector.c
- drivers/gpu/drm/nouveau/nouveau_dma.c
- drivers/gpu/drm/nouveau/nouveau_drv.c
- drivers/gpu/drm/nouveau/nouveau_drv.h
- drivers/gpu/drm/nouveau/nouveau_irq.c
- drivers/gpu/drm/nouveau/nouveau_state.c
- drivers/gpu/drm/nouveau/nv04_crtc.c
- drivers/gpu/drm/nouveau/nv04_fbcon.c
- drivers/gpu/drm/nouveau/nv50_display.c
- drivers/gpu/drm/nouveau/nv50_fb.c
- drivers/gpu/drm/nouveau/nv50_fbcon.c
- drivers/gpu/drm/nouveau/nv50_graph.c
- drivers/gpu/drm/nouveau/nv50_grctx.c
- drivers/gpu/drm/radeon/Makefile
- drivers/gpu/drm/radeon/atom.c
- drivers/gpu/drm/radeon/atom.h
- drivers/gpu/drm/radeon/atombios_crtc.c
- drivers/gpu/drm/radeon/atombios_dp.c
- drivers/gpu/drm/radeon/evergreen.c
- drivers/gpu/drm/radeon/r100.c
- drivers/gpu/drm/radeon/r200.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_audio.c
- drivers/gpu/drm/radeon/r600_blit_shaders.c
- drivers/gpu/drm/radeon/r600_cp.c
- drivers/gpu/drm/radeon/r600_cs.c
- drivers/gpu/drm/radeon/r600_hdmi.c
- drivers/gpu/drm/radeon/r600_reg.h
- drivers/gpu/drm/radeon/r600d.h
- drivers/gpu/drm/radeon/radeon.h
- drivers/gpu/drm/radeon/radeon_asic.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_cs.c
- drivers/gpu/drm/radeon/radeon_device.c
- drivers/gpu/drm/radeon/radeon_display.c
- drivers/gpu/drm/radeon/radeon_drv.c
- drivers/gpu/drm/radeon/radeon_drv.h
- drivers/gpu/drm/radeon/radeon_encoders.c
- drivers/gpu/drm/radeon/radeon_i2c.c
- drivers/gpu/drm/radeon/radeon_irq_kms.c
- drivers/gpu/drm/radeon/radeon_legacy_crtc.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/radeon_pm.c
- drivers/gpu/drm/radeon/radeon_reg.h
- drivers/gpu/drm/radeon/reg_srcs/r600
- drivers/gpu/drm/radeon/rs400.c
- drivers/gpu/drm/radeon/rs600.c
- drivers/gpu/drm/radeon/rs600d.h
- drivers/gpu/drm/radeon/rs690.c
- drivers/gpu/drm/radeon/rs690d.h
- drivers/gpu/drm/radeon/rv515.c
- drivers/gpu/drm/radeon/rv770.c
- drivers/gpu/drm/ttm/ttm_bo.c
- drivers/gpu/drm/ttm/ttm_memory.c
- drivers/gpu/drm/ttm/ttm_tt.c
- drivers/gpu/drm/vmwgfx/Kconfig
- include/drm/drmP.h
- include/drm/drm_mem_util.h
- include/drm/drm_pciids.h
- include/drm/ttm/ttm_bo_driver.h