diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-17 10:14:18 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-17 10:14:18 -0700 |
| commit | 1c7f895fa6531b16e7e9fd4568d4f6a50ca5711e (patch) | |
| tree | b46163c3b5f98e18d3ad1c70c095d77fc71721e6 /linux-core/drm_crtc.h | |
| parent | 4e4d9cbeb3f52b605e46aad8ae1a947ca236079f (diff) | |
| parent | b729b919baed250313caf3f0bbd4044e084de8bf (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
shared-core/i915_init.c - reconcile with airlied's new code
Diffstat (limited to 'linux-core/drm_crtc.h')
| -rw-r--r-- | linux-core/drm_crtc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h index 560c38f4..f8d7da26 100644 --- a/linux-core/drm_crtc.h +++ b/linux-core/drm_crtc.h @@ -184,6 +184,7 @@ struct drm_framebuffer { void *fbdev; u32 pseudo_palette[17]; void *virtual_base; + struct list_head filp_head; }; struct drm_crtc; struct drm_output; @@ -417,7 +418,7 @@ struct drm_mode_config { /* DamagePtr rotationDamage? */ /* DGA stuff? */ struct drm_mode_config_funcs *funcs; - int fb_base; + unsigned long fb_base; }; struct drm_output *drm_output_create(struct drm_device *dev, |