diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 13:38:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 13:38:36 -0400 |
| commit | cad2c8fd9b3afceced08838c87c520e6da417a65 (patch) | |
| tree | 8da6ce24a55e59bb1b81c75c9835626558f7bbf7 /include | |
| parent | 4aa2d56b2149e70a0b944b4f21e4aed33d9ab94e (diff) | |
| parent | 5ef5f72febfea420ce58f670bad83830a5e5e3de (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/kms: teardown crtc correctly when fb is destroyed.
drm/kms/radeon: cleanup combios TV table like DDX.
drm/radeon/kms: memset the allocated framebuffer before using it.
drm/radeon/kms: although LVDS might be possible on crtc 1 don't do it.
drm/radeon/kms: implement bo busy check + current domain
drm/radeon/kms: cut down indirects in register accesses.
drm/radeon/kms: Fix up vertical blank interrupt support.
drm/radeon/kms: add rv530 R300_SU_REG_DEST + reloc for ZPASS_ADDR
drm/edid: fixup detailed timings like the X server.
drm/radeon/kms: Add specific rs690 authorized register table
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/radeon_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index af4b4826997e..f81c3232accd 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h | |||
| @@ -838,7 +838,7 @@ struct drm_radeon_gem_wait_idle { | |||
| 838 | 838 | ||
| 839 | struct drm_radeon_gem_busy { | 839 | struct drm_radeon_gem_busy { |
| 840 | uint32_t handle; | 840 | uint32_t handle; |
| 841 | uint32_t busy; | 841 | uint32_t domain; |
| 842 | }; | 842 | }; |
| 843 | 843 | ||
| 844 | struct drm_radeon_gem_pread { | 844 | struct drm_radeon_gem_pread { |