UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i810: fixed coding style issues 

Fixed brace, macro and spacing coding style issues, and a C99 comment.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Nicolas Kaiser 2010-07-14 21:54:13 +02:00 committed by Dave Airlie
parent 6e35023ffa
commit aca791c28a
2 changed files with 69 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
drivers/gpu/drm/i810/i810_dma.c
View File

@ -60,9 +60,8 @@ static struct drm_buf *i810_freelist_get(struct drm_device * dev)
/* In use is already a pointer */ /* In use is already a pointer */
used = cmpxchg(buf_priv->in_use, I810_BUF_FREE, used = cmpxchg(buf_priv->in_use, I810_BUF_FREE,
I810_BUF_CLIENT); I810_BUF_CLIENT);
if (used == I810_BUF_FREE) { if (used == I810_BUF_FREE)
return buf; return buf;
}
} }
return NULL; return NULL;
} }
@ -71,7 +70,7 @@ static struct drm_buf *i810_freelist_get(struct drm_device * dev)
* yet, the hardware updates in use for us once its on the ring buffer. * yet, the hardware updates in use for us once its on the ring buffer.
*/ */
static int i810_freelist_put(struct drm_device * dev, struct drm_buf * buf) static int i810_freelist_put(struct drm_device *dev, struct drm_buf *buf)
{ {
drm_i810_buf_priv_t *buf_priv = buf->dev_private; drm_i810_buf_priv_t *buf_priv = buf->dev_private;
int used; int used;
@ -121,7 +120,7 @@ static const struct file_operations i810_buffer_fops = {
.fasync = drm_fasync, .fasync = drm_fasync,
}; };
static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv) static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
{ {
struct drm_device *dev = file_priv->minor->dev; struct drm_device *dev = file_priv->minor->dev;
drm_i810_buf_priv_t *buf_priv = buf->dev_private; drm_i810_buf_priv_t *buf_priv = buf->dev_private;
@ -152,7 +151,7 @@ static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
return retcode; return retcode;
} }
static int i810_unmap_buffer(struct drm_buf * buf) static int i810_unmap_buffer(struct drm_buf *buf)
{ {
drm_i810_buf_priv_t *buf_priv = buf->dev_private; drm_i810_buf_priv_t *buf_priv = buf->dev_private;
int retcode = 0; int retcode = 0;
@ -172,7 +171,7 @@ static int i810_unmap_buffer(struct drm_buf * buf)
return retcode; return retcode;
} }
static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d, static int i810_dma_get_buffer(struct drm_device *dev, drm_i810_dma_t *d,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_buf *buf; struct drm_buf *buf;
@ -202,7 +201,7 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
return retcode; return retcode;
} }
static int i810_dma_cleanup(struct drm_device * dev) static int i810_dma_cleanup(struct drm_device *dev)
{ {
struct drm_device_dma *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
@ -218,9 +217,8 @@ static int i810_dma_cleanup(struct drm_device * dev)
drm_i810_private_t *dev_priv = drm_i810_private_t *dev_priv =
(drm_i810_private_t *) dev->dev_private; (drm_i810_private_t *) dev->dev_private;
if (dev_priv->ring.virtual_start) { if (dev_priv->ring.virtual_start)
drm_core_ioremapfree(&dev_priv->ring.map, dev); drm_core_ioremapfree(&dev_priv->ring.map, dev);
}
if (dev_priv->hw_status_page) { if (dev_priv->hw_status_page) {
pci_free_consistent(dev->pdev, PAGE_SIZE, pci_free_consistent(dev->pdev, PAGE_SIZE,
dev_priv->hw_status_page, dev_priv->hw_status_page,
@ -242,7 +240,7 @@ static int i810_dma_cleanup(struct drm_device * dev)
return 0; return 0;
} }
static int i810_wait_ring(struct drm_device * dev, int n) static int i810_wait_ring(struct drm_device *dev, int n)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
drm_i810_ring_buffer_t *ring = &(dev_priv->ring); drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
@ -271,11 +269,11 @@ static int i810_wait_ring(struct drm_device * dev, int n)
udelay(1); udelay(1);
} }
out_wait_ring: out_wait_ring:
return iters; return iters;
} }
static void i810_kernel_lost_context(struct drm_device * dev) static void i810_kernel_lost_context(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
drm_i810_ring_buffer_t *ring = &(dev_priv->ring); drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
@ -287,7 +285,7 @@ static void i810_kernel_lost_context(struct drm_device * dev)
ring->space += ring->Size; ring->space += ring->Size;
} }
static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv) static int i810_freelist_init(struct drm_device *dev, drm_i810_private_t *dev_priv)
{ {
struct drm_device_dma *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int my_idx = 24; int my_idx = 24;
@ -322,9 +320,9 @@ static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_
return 0; return 0;
} }
static int i810_dma_initialize(struct drm_device * dev, static int i810_dma_initialize(struct drm_device *dev,
drm_i810_private_t * dev_priv, drm_i810_private_t *dev_priv,
drm_i810_init_t * init) drm_i810_init_t *init)
{ {
struct drm_map_list *r_list; struct drm_map_list *r_list;
memset(dev_priv, 0, sizeof(drm_i810_private_t)); memset(dev_priv, 0, sizeof(drm_i810_private_t));
@ -462,7 +460,7 @@ static int i810_dma_init(struct drm_device *dev, void *data,
* Use 'volatile' & local var tmp to force the emitted values to be * Use 'volatile' & local var tmp to force the emitted values to be
* identical to the verified ones. * identical to the verified ones.
*/ */
static void i810EmitContextVerified(struct drm_device * dev, static void i810EmitContextVerified(struct drm_device *dev,
volatile unsigned int *code) volatile unsigned int *code)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
@ -495,7 +493,7 @@ static void i810EmitContextVerified(struct drm_device * dev,
ADVANCE_LP_RING(); ADVANCE_LP_RING();
} }
static void i810EmitTexVerified(struct drm_device * dev, volatile unsigned int *code) static void i810EmitTexVerified(struct drm_device *dev, volatile unsigned int *code)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
int i, j = 0; int i, j = 0;
@ -528,7 +526,7 @@ static void i810EmitTexVerified(struct drm_device * dev, volatile unsigned int *
/* Need to do some additional checking when setting the dest buffer. /* Need to do some additional checking when setting the dest buffer.
*/ */
static void i810EmitDestVerified(struct drm_device * dev, static void i810EmitDestVerified(struct drm_device *dev,
volatile unsigned int *code) volatile unsigned int *code)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
@ -563,7 +561,7 @@ static void i810EmitDestVerified(struct drm_device * dev,
ADVANCE_LP_RING(); ADVANCE_LP_RING();
} }
static void i810EmitState(struct drm_device * dev) static void i810EmitState(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
@ -594,7 +592,7 @@ static void i810EmitState(struct drm_device * dev)
/* need to verify /* need to verify
*/ */
static void i810_dma_dispatch_clear(struct drm_device * dev, int flags, static void i810_dma_dispatch_clear(struct drm_device *dev, int flags,
unsigned int clear_color, unsigned int clear_color,
unsigned int clear_zval) unsigned int clear_zval)
{ {
@ -669,7 +667,7 @@ static void i810_dma_dispatch_clear(struct drm_device * dev, int flags,
} }
} }
static void i810_dma_dispatch_swap(struct drm_device * dev) static void i810_dma_dispatch_swap(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
@ -715,8 +713,8 @@ static void i810_dma_dispatch_swap(struct drm_device * dev)
} }
} }
static void i810_dma_dispatch_vertex(struct drm_device * dev, static void i810_dma_dispatch_vertex(struct drm_device *dev,
struct drm_buf * buf, int discard, int used) struct drm_buf *buf, int discard, int used)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
drm_i810_buf_priv_t *buf_priv = buf->dev_private; drm_i810_buf_priv_t *buf_priv = buf->dev_private;
@ -795,7 +793,7 @@ static void i810_dma_dispatch_vertex(struct drm_device * dev,
} }
} }
static void i810_dma_dispatch_flip(struct drm_device * dev) static void i810_dma_dispatch_flip(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
int pitch = dev_priv->pitch; int pitch = dev_priv->pitch;
@ -841,7 +839,7 @@ static void i810_dma_dispatch_flip(struct drm_device * dev)
} }
static void i810_dma_quiescent(struct drm_device * dev) static void i810_dma_quiescent(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
RING_LOCALS; RING_LOCALS;
@ -858,7 +856,7 @@ static void i810_dma_quiescent(struct drm_device * dev)
i810_wait_ring(dev, dev_priv->ring.Size - 8); i810_wait_ring(dev, dev_priv->ring.Size - 8);
} }
static int i810_flush_queue(struct drm_device * dev) static int i810_flush_queue(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
struct drm_device_dma *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
@ -891,7 +889,7 @@ static int i810_flush_queue(struct drm_device * dev)
} }
/* Must be called with the lock held */ /* Must be called with the lock held */
static void i810_reclaim_buffers(struct drm_device * dev, static void i810_reclaim_buffers(struct drm_device *dev,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_device_dma *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
@ -969,9 +967,8 @@ static int i810_clear_bufs(struct drm_device *dev, void *data,
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
/* GH: Someone's doing nasty things... */ /* GH: Someone's doing nasty things... */
if (!dev->dev_private) { if (!dev->dev_private)
return -EINVAL; return -EINVAL;
}
i810_dma_dispatch_clear(dev, clear->flags, i810_dma_dispatch_clear(dev, clear->flags,
clear->clear_color, clear->clear_depth); clear->clear_color, clear->clear_depth);
@ -1039,7 +1036,7 @@ static int i810_docopy(struct drm_device *dev, void *data,
return 0; return 0;
} }
static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf, int used, static void i810_dma_dispatch_mc(struct drm_device *dev, struct drm_buf *buf, int used,
unsigned int last_render) unsigned int last_render)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
@ -1053,9 +1050,8 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf,
i810_kernel_lost_context(dev); i810_kernel_lost_context(dev);
u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_HARDWARE); u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_HARDWARE);
if (u != I810_BUF_CLIENT) { if (u != I810_BUF_CLIENT)
DRM_DEBUG("MC found buffer that isn't mine!\n"); DRM_DEBUG("MC found buffer that isn't mine!\n");
}
if (used > 4 * 1024) if (used > 4 * 1024)
used = 0; used = 0;
@ -1160,7 +1156,7 @@ static int i810_ov0_flip(struct drm_device *dev, void *data,
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
//Tell the overlay to update /* Tell the overlay to update */
I810_WRITE(0x30000, dev_priv->overlay_physical | 0x80000000); I810_WRITE(0x30000, dev_priv->overlay_physical | 0x80000000);
return 0; return 0;
@ -1168,7 +1164,7 @@ static int i810_ov0_flip(struct drm_device *dev, void *data,
/* Not sure why this isn't set all the time: /* Not sure why this isn't set all the time:
*/ */
static void i810_do_init_pageflip(struct drm_device * dev) static void i810_do_init_pageflip(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
@ -1178,7 +1174,7 @@ static void i810_do_init_pageflip(struct drm_device * dev)
dev_priv->sarea_priv->pf_current_page = dev_priv->current_page; dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
} }
static int i810_do_cleanup_pageflip(struct drm_device * dev) static int i810_do_cleanup_pageflip(struct drm_device *dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
@ -1218,28 +1214,27 @@ int i810_driver_load(struct drm_device *dev, unsigned long flags)
return 0; return 0;
} }
void i810_driver_lastclose(struct drm_device * dev) void i810_driver_lastclose(struct drm_device *dev)
{ {
i810_dma_cleanup(dev); i810_dma_cleanup(dev);
} }
void i810_driver_preclose(struct drm_device * dev, struct drm_file *file_priv) void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
{ {
if (dev->dev_private) { if (dev->dev_private) {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
if (dev_priv->page_flipping) { if (dev_priv->page_flipping)
i810_do_cleanup_pageflip(dev); i810_do_cleanup_pageflip(dev);
}
} }
} }
void i810_driver_reclaim_buffers_locked(struct drm_device * dev, void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
i810_reclaim_buffers(dev, file_priv); i810_reclaim_buffers(dev, file_priv);
} }
int i810_driver_dma_quiescent(struct drm_device * dev) int i810_driver_dma_quiescent(struct drm_device *dev)
{ {
i810_dma_quiescent(dev); i810_dma_quiescent(dev);
return 0; return 0;
@ -1276,7 +1271,7 @@ int i810_max_ioctl = DRM_ARRAY_SIZE(i810_ioctls);
* \returns * \returns
* A value of 1 is always retured to indictate every i810 is AGP. * A value of 1 is always retured to indictate every i810 is AGP.
*/ */
int i810_driver_device_is_agp(struct drm_device * dev) int i810_driver_device_is_agp(struct drm_device *dev)
{ {
return 1; return 1;
} }

60
drivers/gpu/drm/i810/i810_drv.h
View File

@ -115,16 +115,16 @@ typedef struct drm_i810_private {
} drm_i810_private_t; } drm_i810_private_t;
/* i810_dma.c */ /* i810_dma.c */
extern int i810_driver_dma_quiescent(struct drm_device * dev); extern int i810_driver_dma_quiescent(struct drm_device *dev);
extern void i810_driver_reclaim_buffers_locked(struct drm_device * dev, extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int i810_driver_load(struct drm_device *, unsigned long flags); extern int i810_driver_load(struct drm_device *, unsigned long flags);
extern void i810_driver_lastclose(struct drm_device * dev); extern void i810_driver_lastclose(struct drm_device *dev);
extern void i810_driver_preclose(struct drm_device * dev, extern void i810_driver_preclose(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern void i810_driver_reclaim_buffers_locked(struct drm_device * dev, extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int i810_driver_device_is_agp(struct drm_device * dev); extern int i810_driver_device_is_agp(struct drm_device *dev);
extern struct drm_ioctl_desc i810_ioctls[]; extern struct drm_ioctl_desc i810_ioctls[];
extern int i810_max_ioctl; extern int i810_max_ioctl;
@ -132,39 +132,41 @@ extern int i810_max_ioctl;
#define I810_BASE(reg) ((unsigned long) \ #define I810_BASE(reg) ((unsigned long) \
dev_priv->mmio_map->handle) dev_priv->mmio_map->handle)
#define I810_ADDR(reg) (I810_BASE(reg) + reg) #define I810_ADDR(reg) (I810_BASE(reg) + reg)
#define I810_DEREF(reg) *(__volatile__ int *)I810_ADDR(reg) #define I810_DEREF(reg) (*(__volatile__ int *)I810_ADDR(reg))
#define I810_READ(reg) I810_DEREF(reg) #define I810_READ(reg) I810_DEREF(reg)
#define I810_WRITE(reg,val) do { I810_DEREF(reg) = val; } while (0) #define I810_WRITE(reg, val) do { I810_DEREF(reg) = val; } while (0)
#define I810_DEREF16(reg) *(__volatile__ u16 *)I810_ADDR(reg) #define I810_DEREF16(reg) (*(__volatile__ u16 *)I810_ADDR(reg))
#define I810_READ16(reg) I810_DEREF16(reg) #define I810_READ16(reg) I810_DEREF16(reg)
#define I810_WRITE16(reg,val) do { I810_DEREF16(reg) = val; } while (0) #define I810_WRITE16(reg, val) do { I810_DEREF16(reg) = val; } while (0)
#define I810_VERBOSE 0 #define I810_VERBOSE 0
#define RING_LOCALS unsigned int outring, ringmask; \ #define RING_LOCALS unsigned int outring, ringmask; \
volatile char *virt; volatile char *virt;
#define BEGIN_LP_RING(n) do { \ #define BEGIN_LP_RING(n) do { \
if (I810_VERBOSE) \ if (I810_VERBOSE) \
DRM_DEBUG("BEGIN_LP_RING(%d)\n", n); \ DRM_DEBUG("BEGIN_LP_RING(%d)\n", n); \
if (dev_priv->ring.space < n*4) \ if (dev_priv->ring.space < n*4) \
i810_wait_ring(dev, n*4); \ i810_wait_ring(dev, n*4); \
dev_priv->ring.space -= n*4; \ dev_priv->ring.space -= n*4; \
outring = dev_priv->ring.tail; \ outring = dev_priv->ring.tail; \
ringmask = dev_priv->ring.tail_mask; \ ringmask = dev_priv->ring.tail_mask; \
virt = dev_priv->ring.virtual_start; \ virt = dev_priv->ring.virtual_start; \
} while (0) } while (0)
#define ADVANCE_LP_RING() do { \ #define ADVANCE_LP_RING() do { \
if (I810_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n"); \ if (I810_VERBOSE) \
DRM_DEBUG("ADVANCE_LP_RING\n"); \
dev_priv->ring.tail = outring; \ dev_priv->ring.tail = outring; \
I810_WRITE(LP_RING + RING_TAIL, outring); \ I810_WRITE(LP_RING + RING_TAIL, outring); \
} while(0) } while (0)
#define OUT_RING(n) do { \ #define OUT_RING(n) do { \
if (I810_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \ if (I810_VERBOSE) \
*(volatile unsigned int *)(virt + outring) = n; \ DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \
outring += 4; \ *(volatile unsigned int *)(virt + outring) = n; \
outring &= ringmask; \ outring += 4; \
outring &= ringmask; \
} while (0) } while (0)
#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) #define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))