diff options
| author | Jakob Bornecrantz <wallbraker@gmail.com> | 2007-04-10 18:44:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-04-10 18:44:47 +1000 |
| commit | b50bda002b824efb24e18e8d514ff0ca763c15b9 (patch) | |
| tree | 4dba23e53834ca25760d2fd8a55498c43a390c91 /shared-core | |
| parent | 7e2b1a6cf55579c6f8b1fd56a97e9f41e34b88fc (diff) | |
add addfb/rmfb ioctls
Originally from Jakob, cleaned up by airlied.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 10 | ||||
| -rw-r--r-- | shared-core/i915_dma.c | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index 49bc41bc..8329609f 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -962,6 +962,14 @@ struct drm_mode_get_output { }; +struct drm_mode_fb_cmd { + unsigned int buffer_id; + unsigned int width, height; + unsigned int pitch; + unsigned int bpp; + unsigned int handle; +}; + /** * \name Ioctls Definitions */ @@ -1037,6 +1045,8 @@ struct drm_mode_get_output { #define DRM_IOCTL_MODE_GETCRTC DRM_IOWR(0xA1, struct drm_mode_crtc) #define DRM_IOCTL_MODE_GETOUTPUT DRM_IOWR(0xA2, struct drm_mode_get_output) #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) /*@}*/ /** diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index a5f1473a..811e4bb9 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -171,8 +171,6 @@ static int i915_initialize(drm_device_t * dev, I915_WRITE(0x02080, dev_priv->dma_status_page); DRM_DEBUG("Enabled hardware status page\n"); - /* this probably doesn't belong here - TODO */ - drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle); drm_set_desired_modes(dev); return 0; |