git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 20 Apr 2010 03:15:05 +0000 (13:15 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 20 Apr 2010 03:15:05 +0000 (13:15 +1000)
commit	976b0b1778d9e636a73e2c9dc517c264cfad5b55
tree	c51aa8427a81cb64dded4d4f68bf1a1b8ad32041	tree \| snapshot
parent	578eed46367443b25ec446469789177642520554	commit \| diff
parent	7e4b25206b65e30b47b4365a5ef372cc99f64876	commit \| diff

Merge branch 'drm-radeon-lockup' into drm-core-next

* drm-radeon-lockup:
  drm/radeon/kms: simplify & improve GPU reset V2
  drm/radeon/kms: rename gpu_reset to asic_reset
  drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4

Conflicts:
drivers/gpu/drm/radeon/r300.c

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/radeon/evergreen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r100.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r300.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r420.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_fence.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/rs400.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/rs600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/rv515.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/rv770.c	diff1 \|	diff2 \|	blob \| history