Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58c1e85a authored by Nicolas Kaiser's avatar Nicolas Kaiser Committed by Dave Airlie
Browse files

drm/via: fixed coding style issues, simplified return 



Fixed brace, macro and spacing coding style issues.
Simplified
 -if (ret) return ret;
 -return 0;
 +return ret;

Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 56499113

drivers/gpu/drm/via/via_dma.c

+52 −68
Original line number Diff line number Diff line
@@ -63,10 +63,11 @@ 


#define via_flush_write_combine() DRM_MEMORYBARRIER()



#define VIA_OUT_RING_QW(w1,w2)			\

#define VIA_OUT_RING_QW(w1, w2)	do {		\

	*vb++ = (w1);				\

	*vb++ = (w2);				\

	dev_priv->dma_low += 8;

	dev_priv->dma_low += 8;			\

} while (0)



static void via_cmdbuf_start(drm_via_private_t *dev_priv);

static void via_cmdbuf_pause(drm_via_private_t *dev_priv);
@@ -146,9 +147,8 @@ static inline uint32_t *via_check_dma(drm_via_private_t * dev_priv, 
	    dev_priv->dma_high) {

		via_cmdbuf_rewind(dev_priv);

	}

	if (via_cmdbuf_wait(dev_priv, size) != 0) {

	if (via_cmdbuf_wait(dev_priv, size) != 0)

		return NULL;

	}



	return (uint32_t *) (dev_priv->dma_ptr + dev_priv->dma_low);

}
@@ -271,9 +271,8 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t * 
		return -EFAULT;

	}



	if (cmd->size > VIA_PCI_BUF_SIZE) {

	if (cmd->size > VIA_PCI_BUF_SIZE)

		return -ENOMEM;

	}



	if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))

		return -EFAULT;
@@ -291,9 +290,8 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t * 
	}



	vb = via_check_dma(dev_priv, (cmd->size < 0x100) ? 0x102 : cmd->size);

	if (vb == NULL) {

	if (vb == NULL)

		return -EAGAIN;

	}



	memcpy(vb, dev_priv->pci_buf, cmd->size);
@@ -315,9 +313,8 @@ int via_driver_dma_quiescent(struct drm_device * dev) 
{

	drm_via_private_t *dev_priv = dev->dev_private;



	if (!via_wait_idle(dev_priv)) {

	if (!via_wait_idle(dev_priv))

		return -EBUSY;

	}

	return 0;

}
@@ -339,22 +336,17 @@ static int via_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *fi 
	DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);



	ret = via_dispatch_cmdbuffer(dev, cmdbuf);

	if (ret) {

	return ret;

}



	return 0;

}



static int via_dispatch_pci_cmdbuffer(struct drm_device *dev,

				      drm_via_cmdbuffer_t *cmd)

{

	drm_via_private_t *dev_priv = dev->dev_private;

	int ret;



	if (cmd->size > VIA_PCI_BUF_SIZE) {

	if (cmd->size > VIA_PCI_BUF_SIZE)

		return -ENOMEM;

	}

	if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))

		return -EFAULT;
@@ -380,19 +372,14 @@ static int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file 
	DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);



	ret = via_dispatch_pci_cmdbuffer(dev, cmdbuf);

	if (ret) {

	return ret;

}



	return 0;

}



static inline uint32_t *via_align_buffer(drm_via_private_t *dev_priv,

					 uint32_t * vb, int qw_count)

{

	for (; qw_count > 0; --qw_count) {

	for (; qw_count > 0; --qw_count)

		VIA_OUT_RING_QW(HC_DUMMY, HC_DUMMY);

	}

	return vb;

}
@@ -617,9 +604,8 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv) 
	 */



	dev_priv->dma_low = 0;

	if (via_cmdbuf_wait(dev_priv, CMDBUF_ALIGNMENT_SIZE) != 0) {

	if (via_cmdbuf_wait(dev_priv, CMDBUF_ALIGNMENT_SIZE) != 0)

		DRM_ERROR("via_cmdbuf_jump failed\n");

	}



	via_dummy_bitblt(dev_priv);

	via_dummy_bitblt(dev_priv);
@@ -708,10 +694,9 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file * 
	case VIA_CMDBUF_SPACE:

		while (((tmp_size = via_cmdbuf_space(dev_priv)) < d_siz->size)

		       && --count) {

			if (!d_siz->wait) {

			if (!d_siz->wait)

				break;

		}

		}

		if (!count) {

			DRM_ERROR("VIA_CMDBUF_SPACE timed out.\n");

			ret = -EAGAIN;
@@ -720,10 +705,9 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file * 
	case VIA_CMDBUF_LAG:

		while (((tmp_size = via_cmdbuf_lag(dev_priv)) > d_siz->size)

		       && --count) {

			if (!d_siz->wait) {

			if (!d_siz->wait)

				break;

		}

		}

		if (!count) {

			DRM_ERROR("VIA_CMDBUF_LAG timed out.\n");

			ret = -EAGAIN;

drivers/gpu/drm/via/via_dmablit.c

+32 −39
Original line number Diff line number Diff line
@@ -324,11 +324,10 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq) 
	DRM_DEBUG("DMA blit handler called. engine = %d, from_irq = %d, blitq = 0x%lx\n",

		  engine, from_irq, (unsigned long) blitq);



	if (from_irq) {

	if (from_irq)

		spin_lock(&blitq->blit_lock);

	} else {

	else

		spin_lock_irqsave(&blitq->blit_lock, irqsave);

	}



	done_transfer = blitq->is_active &&

	  ((status = VIA_READ(VIA_PCI_DMA_CSR0 + engine*0x04)) & VIA_DMA_CSR_TD);
@@ -377,19 +376,17 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq) 
			if (!timer_pending(&blitq->poll_timer))

				mod_timer(&blitq->poll_timer, jiffies + 1);

		} else {

			if (timer_pending(&blitq->poll_timer)) {

			if (timer_pending(&blitq->poll_timer))

				del_timer(&blitq->poll_timer);

			}

			via_dmablit_engine_off(dev, engine);

		}

	}



	if (from_irq) {

	if (from_irq)

		spin_unlock(&blitq->blit_lock);

	} else {

	else

		spin_unlock_irqrestore(&blitq->blit_lock, irqsave);

}

}
@@ -415,9 +412,8 @@ via_dmablit_active(drm_via_blitq_t *blitq, int engine, uint32_t handle, wait_que 


	if (queue && active) {

		slot = handle - blitq->done_blit_handle + blitq->cur - 1;

		if (slot >= VIA_NUM_BLIT_SLOTS) {

		if (slot >= VIA_NUM_BLIT_SLOTS)

			slot -= VIA_NUM_BLIT_SLOTS;

		}

		*queue = blitq->blit_queue + slot;

	}
@@ -564,9 +560,8 @@ via_init_dmablit(struct drm_device *dev) 
		blitq->is_active = 0;

		blitq->aborting = 0;

		spin_lock_init(&blitq->blit_lock);

		for (j=0; j<VIA_NUM_BLIT_SLOTS; ++j) {

		for (j = 0; j < VIA_NUM_BLIT_SLOTS; ++j)

			DRM_INIT_WAITQUEUE(blitq->blit_queue + j);

		}

		DRM_INIT_WAITQUEUE(&blitq->busy_queue);

		INIT_WORK(&blitq->wq, via_dmablit_workqueue);

		setup_timer(&blitq->poll_timer, via_dmablit_timer,
@@ -694,9 +689,8 @@ via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine) 
		spin_unlock_irqrestore(&blitq->blit_lock, irqsave);



		DRM_WAIT_ON(ret, blitq->busy_queue, DRM_HZ, blitq->num_free > 0);

		if (ret) {

		if (ret)

			return (-EINTR == ret) ? -EAGAIN : ret;

		}



		spin_lock_irqsave(&blitq->blit_lock, irqsave);

	}
@@ -744,9 +738,8 @@ via_dmablit(struct drm_device *dev, drm_via_dmablit_t *xfer) 


	engine = (xfer->to_fb) ? 0 : 1;

	blitq = dev_priv->blit_queues + engine;

	if (0 != (ret = via_dmablit_grab_slot(blitq, engine))) {

	if (0 != (ret = via_dmablit_grab_slot(blitq, engine)))

		return ret;

	}

	if (NULL == (vsg = kmalloc(sizeof(*vsg), GFP_KERNEL))) {

		via_dmablit_release_slot(blitq);

		return -ENOMEM;

drivers/gpu/drm/via/via_irq.c

+6 −7
Original line number Diff line number Diff line
@@ -141,12 +141,11 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) 
			atomic_inc(&cur_irq->irq_received);

			DRM_WAKEUP(&cur_irq->irq_queue);

			handled = 1;

			if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) {

			if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)

				via_dmablit_handler(dev, 0, 1);

			} else if (dev_priv->irq_map[drm_via_irq_dma1_td] == i) {

			else if (dev_priv->irq_map[drm_via_irq_dma1_td] == i)

				via_dmablit_handler(dev, 1, 1);

		}

		}

		cur_irq++;

	}

drivers/gpu/drm/via/via_mm.c

+3 −4
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ void via_reclaim_buffers_locked(struct drm_device * dev, 
		return;

	}



	if (dev->driver->dma_quiescent) {

	if (dev->driver->dma_quiescent)

		dev->driver->dma_quiescent(dev);

	}



	drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/via/via_verifier.c

+21 −26
Original line number Diff line number Diff line
@@ -706,9 +706,8 @@ via_check_header2(uint32_t const **buffer, const uint32_t * buf_end, 
			return state_error;

		}

	}

	if (hc_state->unfinished && finish_current_sequence(hc_state)) {

	if (hc_state->unfinished && finish_current_sequence(hc_state))

		return state_error;

	}

	*buffer = buf;

	return state_command;

}
@@ -893,9 +892,8 @@ via_parse_vheader5(drm_via_private_t * dev_priv, uint32_t const **buffer, 
	addr = *buf++ & ~VIA_VIDEOMASK;

	i = count = *buf;

	buf += 3;

	while (i--) {

	while (i--)

		VIA_WRITE(addr, *buf++);

	}

	if (count & 3)

		buf += 4 - (count & 3);

	*buffer = buf;
@@ -1085,9 +1083,8 @@ via_parse_command_stream(struct drm_device * dev, const uint32_t * buf, 
			return -EINVAL;

		}

	}

	if (state == state_error) {

	if (state == state_error)

		return -EINVAL;

	}

	return 0;

}
@@ -1096,14 +1093,12 @@ setup_hazard_table(hz_init_t init_table[], hazard_t table[], int size) 
{

	int i;



	for (i = 0; i < 256; ++i) {

	for (i = 0; i < 256; ++i)

		table[i] = forbidden_command;

	}



	for (i = 0; i < size; ++i) {

	for (i = 0; i < size; ++i)

		table[init_table[i].code] = init_table[i].hz;

}

}



void via_init_command_verifier(void)

{

drivers/gpu/drm/via/via_dmablit.h

+4 −4

File changed.

Contains only whitespace changes.

drivers/gpu/drm/via/via_drv.h

+11 −11

File changed.

Contains only whitespace changes.

drivers/gpu/drm/via/via_map.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/gpu/drm/via/via_verifier.h

+2 −2

File changed.

Contains only whitespace changes.

drivers/gpu/drm/via/via_video.c

+3 −3

File changed.

Contains only whitespace changes.