Skip to content

L
linux
Commit 56499113 authored by Nicolas Kaiser's avatar Nicolas Kaiser Committed by Dave Airlie
Browse files
Options

drm/i830: fixed brace and spacing coding style issues 

Fixed brace and spacing coding style issues.
Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent aca791c2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 79 deletions
drivers/gpu/drm/i830/i830_dma.c
View file @ 56499113
This diff is collapsed.
drivers/gpu/drm/i830/i830_drv.h
View file @ 56499113
...@@ -132,22 +132,22 @@ extern int i830_irq_wait(struct drm_device *dev, void *data, ...@@ -132,22 +132,22 @@ extern int i830_irq_wait(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS); extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS);
extern void i830_driver_irq_preinstall(struct drm_device * dev); extern void i830_driver_irq_preinstall(struct drm_device *dev);
extern void i830_driver_irq_postinstall(struct drm_device * dev); extern void i830_driver_irq_postinstall(struct drm_device *dev);
extern void i830_driver_irq_uninstall(struct drm_device * dev); extern void i830_driver_irq_uninstall(struct drm_device *dev);
extern int i830_driver_load(struct drm_device *, unsigned long flags); extern int i830_driver_load(struct drm_device *, unsigned long flags);
extern void i830_driver_preclose(struct drm_device * dev, extern void i830_driver_preclose(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern void i830_driver_lastclose(struct drm_device * dev); extern void i830_driver_lastclose(struct drm_device *dev);
extern void i830_driver_reclaim_buffers_locked(struct drm_device * dev, extern void i830_driver_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int i830_driver_dma_quiescent(struct drm_device * dev); extern int i830_driver_dma_quiescent(struct drm_device *dev);
extern int i830_driver_device_is_agp(struct drm_device * dev); extern int i830_driver_device_is_agp(struct drm_device *dev);
#define I830_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) #define I830_READ(reg) DRM_READ32(dev_priv->mmio_map, reg)
#define I830_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) #define I830_WRITE(reg, val) DRM_WRITE32(dev_priv->mmio_map, reg, val)
#define I830_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg) #define I830_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg)
#define I830_WRITE16(reg,val) DRM_WRITE16(dev_priv->mmio_map, reg, val) #define I830_WRITE16(reg, val) DRM_WRITE16(dev_priv->mmio_map, reg, val)
#define I830_VERBOSE 0 #define I830_VERBOSE 0
...@@ -166,7 +166,8 @@ extern int i830_driver_device_is_agp(struct drm_device * dev); ...@@ -166,7 +166,8 @@ extern int i830_driver_device_is_agp(struct drm_device * dev);
} while (0) } while (0)
#define OUT_RING(n) do { \ #define OUT_RING(n) do { \
if (I830_VERBOSE) printk(" OUT_RING %x\n", (int)(n)); \ if (I830_VERBOSE) \
printk(" OUT_RING %x\n", (int)(n)); \
*(volatile unsigned int *)(virt + outring) = n; \ *(volatile unsigned int *)(virt + outring) = n; \
outcount++; \ outcount++; \
outring += 4; \ outring += 4; \
...@@ -174,13 +175,14 @@ extern int i830_driver_device_is_agp(struct drm_device * dev); ...@@ -174,13 +175,14 @@ extern int i830_driver_device_is_agp(struct drm_device * dev);
} while (0) } while (0)
#define ADVANCE_LP_RING() do { \ #define ADVANCE_LP_RING() do { \
if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring); \ if (I830_VERBOSE) \
printk("ADVANCE_LP_RING %x\n", outring); \
dev_priv->ring.tail = outring; \ dev_priv->ring.tail = outring; \
dev_priv->ring.space -= outcount * 4; \ dev_priv->ring.space -= outcount * 4; \
I830_WRITE(LP_RING + RING_TAIL, outring); \ I830_WRITE(LP_RING + RING_TAIL, outring); \
} while(0) } while (0)
extern int i830_wait_ring(struct drm_device * dev, int n, const char *caller); extern int i830_wait_ring(struct drm_device *dev, int n, const char *caller);
#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) #define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))
#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23)) #define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23))
......
drivers/gpu/drm/i830/i830_irq.c
View file @ 56499113
...@@ -53,7 +53,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS) ...@@ -53,7 +53,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int i830_emit_irq(struct drm_device * dev) static int i830_emit_irq(struct drm_device *dev)
{ {
drm_i830_private_t *dev_priv = dev->dev_private; drm_i830_private_t *dev_priv = dev->dev_private;
RING_LOCALS; RING_LOCALS;
...@@ -70,7 +70,7 @@ static int i830_emit_irq(struct drm_device * dev) ...@@ -70,7 +70,7 @@ static int i830_emit_irq(struct drm_device * dev)
return atomic_read(&dev_priv->irq_emitted); return atomic_read(&dev_priv->irq_emitted);
} }
static int i830_wait_irq(struct drm_device * dev, int irq_nr) static int i830_wait_irq(struct drm_device *dev, int irq_nr)
{ {
drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
DECLARE_WAITQUEUE(entry, current); DECLARE_WAITQUEUE(entry, current);
...@@ -156,7 +156,7 @@ int i830_irq_wait(struct drm_device *dev, void *data, ...@@ -156,7 +156,7 @@ int i830_irq_wait(struct drm_device *dev, void *data,
/* drm_dma.h hooks /* drm_dma.h hooks
*/ */
void i830_driver_irq_preinstall(struct drm_device * dev) void i830_driver_irq_preinstall(struct drm_device *dev)
{ {
drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
...@@ -168,14 +168,14 @@ void i830_driver_irq_preinstall(struct drm_device * dev) ...@@ -168,14 +168,14 @@ void i830_driver_irq_preinstall(struct drm_device * dev)
init_waitqueue_head(&dev_priv->irq_queue); init_waitqueue_head(&dev_priv->irq_queue);
} }
void i830_driver_irq_postinstall(struct drm_device * dev) void i830_driver_irq_postinstall(struct drm_device *dev)
{ {
drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
I830_WRITE16(I830REG_INT_ENABLE_R, 0x2); I830_WRITE16(I830REG_INT_ENABLE_R, 0x2);
} }
void i830_driver_irq_uninstall(struct drm_device * dev) void i830_driver_irq_uninstall(struct drm_device *dev)
{ {
drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
if (!dev_priv) if (!dev_priv)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7