Commit bd63cb52 authored by Dave Airlie's avatar Dave Airlie

drm: remove sarea typedefs

Leave the userspace typedefs in place
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent e0be428e
...@@ -50,29 +50,35 @@ ...@@ -50,29 +50,35 @@
#define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000 #define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000
/** SAREA drawable */ /** SAREA drawable */
typedef struct drm_sarea_drawable { struct drm_sarea_drawable {
unsigned int stamp; unsigned int stamp;
unsigned int flags; unsigned int flags;
} drm_sarea_drawable_t; };
/** SAREA frame */ /** SAREA frame */
typedef struct drm_sarea_frame { struct drm_sarea_frame {
unsigned int x; unsigned int x;
unsigned int y; unsigned int y;
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
unsigned int fullscreen; unsigned int fullscreen;
} drm_sarea_frame_t; };
/** SAREA */ /** SAREA */
typedef struct drm_sarea { struct drm_sarea {
/** first thing is always the DRM locking structure */ /** first thing is always the DRM locking structure */
struct drm_hw_lock lock; struct drm_hw_lock lock;
/** \todo Use readers/writer lock for drm_sarea::drawable_lock */ /** \todo Use readers/writer lock for drm_sarea::drawable_lock */
struct drm_hw_lock drawable_lock; struct drm_hw_lock drawable_lock;
drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */ struct drm_sarea_drawable drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */
drm_sarea_frame_t frame; /**< frame */ struct drm_sarea_frame frame; /**< frame */
drm_context_t dummy_context; drm_context_t dummy_context;
} drm_sarea_t; };
#ifndef __KERNEL__
typedef struct drm_sarea_drawable drm_sarea_drawable_t;
typedef struct drm_sarea_frame drm_sarea_frame_t;
typedef struct drm_sarea drm_sarea_t;
#endif
#endif /* _DRM_SAREA_H_ */ #endif /* _DRM_SAREA_H_ */
...@@ -1415,7 +1415,7 @@ static void radeon_cp_dispatch_swap(struct drm_device * dev) ...@@ -1415,7 +1415,7 @@ static void radeon_cp_dispatch_swap(struct drm_device * dev)
static void radeon_cp_dispatch_flip(struct drm_device * dev) static void radeon_cp_dispatch_flip(struct drm_device * dev)
{ {
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
drm_sarea_t *sarea = (drm_sarea_t *) dev_priv->sarea->handle; struct drm_sarea *sarea = (struct drm_sarea *) dev_priv->sarea->handle;
int offset = (dev_priv->sarea_priv->pfCurrentPage == 1) int offset = (dev_priv->sarea_priv->pfCurrentPage == 1)
? dev_priv->front_offset : dev_priv->back_offset; ? dev_priv->front_offset : dev_priv->back_offset;
RING_LOCALS; RING_LOCALS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment