| commit | 6d7c2b4cfa5cb17c9f84c949bfece17b60b0f929 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 19 07:55:43 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 19 07:55:43 2011 -0700 |
| tree | 158370d2c14c8c34e432bee40c4753f5d245a76d | |
| parent | 1f0772fe27aa03764478bd9d3a4cbad417a854cc [diff] | |
| parent | 003cefe0c238e683a29d2207dba945b508cd45b7 [diff] |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon/kms: Make GPU/CPU page size handling consistent in blit code (v2) drm/radeon/kms: fix typo in r100_blit_copy drm/radeon: Unreference GEM object outside of spinlock in page flip error path. drm/radeon: Don't read from CP ring write pointer registers. drm/ttm: request zeroed system memory pages for new TT buffer objects