diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-11-05 15:59:37 +0100 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2008-11-05 15:59:37 +0100 |
| commit | ddfb12b32e64d00d302f7fbb36fb079deec3646f (patch) | |
| tree | 5caeade40ef88936a88e47060b6090aa44d38b94 /linux-core/radeon_mode.h | |
| parent | 7651b4c424aa6c6ac6c47b2d07c8f65d0b9d0191 (diff) | |
| parent | 68fcb7770efc20b9e27b1724e2fb5ac112a5330e (diff) | |
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
Diffstat (limited to 'linux-core/radeon_mode.h')
| -rw-r--r-- | linux-core/radeon_mode.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/radeon_mode.h b/linux-core/radeon_mode.h index 64608e35..23de1088 100644 --- a/linux-core/radeon_mode.h +++ b/linux-core/radeon_mode.h @@ -255,6 +255,7 @@ struct radeon_connector { struct radeon_framebuffer { struct drm_framebuffer base; struct drm_bo_kmap_obj kmap_obj; + struct drm_gem_object *obj; }; extern struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, @@ -323,7 +324,7 @@ extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, u16 blue, int regno); struct drm_framebuffer *radeon_framebuffer_create(struct drm_device *dev, struct drm_mode_fb_cmd *mode_cmd, - void *mm_private); + struct drm_gem_object *obj); int radeonfb_probe(struct drm_device *dev); |