fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 15:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

whitespace fixups from kernel

Browse source
This commit is contained in:
Dave Airlie 2007-05-08 15:43:29 +10:00
parent adee6f52e6
commit ce58e53a01
4 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux-core/drm_pci.c
View file

@ -51,10 +51,8 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
dma_addr_t maxaddr) dma_addr_t maxaddr)
{ {
drm_dma_handle_t *dmah; drm_dma_handle_t *dmah;
#if 1
unsigned long addr; unsigned long addr;
size_t sz; size_t sz;
#endif
#ifdef DRM_DEBUG_MEMORY #ifdef DRM_DEBUG_MEMORY
int area = DRM_MEM_DMA; int area = DRM_MEM_DMA;

3
shared-core/radeon_cp.c
View file

@ -1391,8 +1391,7 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
DRM_DEBUG("\n"); DRM_DEBUG("\n");
/* if we require new memory map but we don't have it fail */ /* if we require new memory map but we don't have it fail */
if ((dev_priv->flags & RADEON_NEW_MEMMAP) && !dev_priv->new_memmap) if ((dev_priv->flags & RADEON_NEW_MEMMAP) && !dev_priv->new_memmap) {
{
DRM_ERROR("Cannot initialise DRM on this card\nThis card requires a new X.org DDX for 3D\n"); DRM_ERROR("Cannot initialise DRM on this card\nThis card requires a new X.org DDX for 3D\n");
radeon_do_cleanup_cp(dev); radeon_do_cleanup_cp(dev);
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);

23
shared-core/via_dma.c
View file

@ -103,7 +103,7 @@ via_cmdbuf_wait(drm_via_private_t * dev_priv, unsigned int size)
uint32_t count; uint32_t count;
hw_addr_ptr = dev_priv->hw_addr_ptr; hw_addr_ptr = dev_priv->hw_addr_ptr;
cur_addr = dev_priv->dma_low; cur_addr = dev_priv->dma_low;
next_addr = cur_addr + size + 512*1024; next_addr = cur_addr + size + 512 * 1024;
count = 1000000; count = 1000000;
do { do {
hw_addr = *hw_addr_ptr - agp_base; hw_addr = *hw_addr_ptr - agp_base;
@ -240,7 +240,7 @@ static int via_dma_init(DRM_IOCTL_ARGS)
break; break;
case VIA_DMA_INITIALIZED: case VIA_DMA_INITIALIZED:
retcode = (dev_priv->ring.virtual_start != NULL) ? retcode = (dev_priv->ring.virtual_start != NULL) ?
0: DRM_ERR( EFAULT ); 0 : DRM_ERR(EFAULT);
break; break;
default: default:
retcode = DRM_ERR(EINVAL); retcode = DRM_ERR(EINVAL);
@ -270,7 +270,6 @@ static int via_dispatch_cmdbuffer(drm_device_t * dev, drm_via_cmdbuffer_t * cmd)
return DRM_ERR(ENOMEM); return DRM_ERR(ENOMEM);
} }
if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size)) if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))
return DRM_ERR(EFAULT); return DRM_ERR(EFAULT);
@ -301,7 +300,7 @@ static int via_dispatch_cmdbuffer(drm_device_t * dev, drm_via_cmdbuffer_t * cmd)
*/ */
if (cmd->size < 0x100) if (cmd->size < 0x100)
via_pad_cache(dev_priv,(0x100 - cmd->size) >> 3); via_pad_cache(dev_priv, (0x100 - cmd->size) >> 3);
via_cmdbuf_pause(dev_priv); via_cmdbuf_pause(dev_priv);
return 0; return 0;
@ -321,7 +320,7 @@ static int via_flush_ioctl(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
LOCK_TEST_WITH_RETURN( dev, filp ); LOCK_TEST_WITH_RETURN(dev, filp);
return via_driver_dma_quiescent(dev); return via_driver_dma_quiescent(dev);
} }
@ -332,7 +331,7 @@ static int via_cmdbuffer(DRM_IOCTL_ARGS)
drm_via_cmdbuffer_t cmdbuf; drm_via_cmdbuffer_t cmdbuf;
int ret; int ret;
LOCK_TEST_WITH_RETURN( dev, filp ); LOCK_TEST_WITH_RETURN(dev, filp);
DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data, DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data,
sizeof(cmdbuf)); sizeof(cmdbuf));
@ -360,7 +359,7 @@ static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,
return DRM_ERR(EFAULT); return DRM_ERR(EFAULT);
if ((ret = if ((ret =
via_verify_command_stream((uint32_t *)dev_priv->pci_buf, via_verify_command_stream((uint32_t *) dev_priv->pci_buf,
cmd->size, dev, 0))) { cmd->size, dev, 0))) {
return ret; return ret;
} }
@ -377,7 +376,7 @@ static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
drm_via_cmdbuffer_t cmdbuf; drm_via_cmdbuffer_t cmdbuf;
int ret; int ret;
LOCK_TEST_WITH_RETURN( dev, filp ); LOCK_TEST_WITH_RETURN(dev, filp);
DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data, DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t __user *) data,
sizeof(cmdbuf)); sizeof(cmdbuf));
@ -393,7 +392,6 @@ static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
return 0; return 0;
} }
static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv, static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv,
uint32_t * vb, int qw_count) uint32_t * vb, int qw_count)
{ {
@ -403,7 +401,6 @@ static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv,
return vb; return vb;
} }
/* /*
* This function is used internally by ring buffer mangement code. * This function is used internally by ring buffer mangement code.
* *
@ -419,8 +416,7 @@ static inline uint32_t *via_get_dma(drm_via_private_t * dev_priv)
* modifying the pause address stored in the buffer itself. If * modifying the pause address stored in the buffer itself. If
* the regulator has already paused, restart it. * the regulator has already paused, restart it.
*/ */
static int via_hook_segment(drm_via_private_t * dev_priv,
static int via_hook_segment(drm_via_private_t *dev_priv,
uint32_t pause_addr_hi, uint32_t pause_addr_lo, uint32_t pause_addr_hi, uint32_t pause_addr_lo,
int no_pci_fire) int no_pci_fire)
{ {
@ -508,9 +504,6 @@ static uint32_t *via_align_cmd(drm_via_private_t * dev_priv, uint32_t cmd_type,
return vb; return vb;
} }
static void via_cmdbuf_start(drm_via_private_t * dev_priv) static void via_cmdbuf_start(drm_via_private_t * dev_priv)
{ {
uint32_t pause_addr_lo, pause_addr_hi; uint32_t pause_addr_lo, pause_addr_hi;