]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c8eb0d a424d76)
Merge branch 'drm-kdb-next' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Wed, 6 Oct 2010 02:57:50 +0000 (12:57 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 6 Oct 2010 02:57:50 +0000 (12:57 +1000)
* drm-kdb-next:
  drm/nouveau/kms: Avoid a hang entering KDB with VT accel on.
  radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit
  drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API
  drm/nouveau/kms: Implement KDB debug hooks for nouveau KMS.
  drm/radeon/kms: Implement KDB debug hooks for radeon KMS.

1  2 
drivers/gpu/drm/nouveau/nv04_crtc.c patch | diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nv50_crtc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/nouveau/nv04_crtc.c
Simple merge
diff --cc drivers/gpu/drm/nouveau/nv50_crtc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.