diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-11 20:41:54 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-11 20:41:54 -0700 |
| commit | e8bd9fdf31bf3db91431b69ce1fc8d419148c838 (patch) | |
| tree | 6a71e0a919484e8a5255063d3abc691e05e70665 /shared-core | |
| parent | 0430a80fc7861a3397a3f2649dfeb9eff14359a5 (diff) | |
| parent | b1f0fd6dfbd1495aa08c6358e936582eeca042c8 (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 1 | ||||
| -rw-r--r-- | shared-core/i915_init.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index 698f851b..b5b0aa52 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -1051,6 +1051,7 @@ struct drm_mode_fb_cmd { #define DRM_IOCTL_MODE_SETCRTC DRM_IOWR(0xA3, struct drm_mode_crtc) #define DRM_IOCTL_MODE_ADDFB DRM_IOWR(0xA4, struct drm_mode_fb_cmd) #define DRM_IOCTL_MODE_RMFB DRM_IOWR(0xA5, unsigned int) +#define DRM_IOCTL_MODE_GETFB DRM_IOWR(0xA6, struct drm_mode_fb_cmd) /*@}*/ /** diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 7616b33e..1a8af0ab 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -211,8 +211,6 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags) drm_initial_config(dev, fb, false); drmfb_probe(dev, fb); - drm_set_desired_modes(dev); - #if 0 /* FIXME: command ring needs AGP space, do we own it at this point? */ dev_priv->ring.Start = dev_priv->baseaddr; |