Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 306453
b: refs/heads/master
c: 2b61d46
h: refs/heads/master
i:
  306451: 8c07514
v: v3
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed May 15, 2012
1 parent 1c19724 commit 08920a0
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 90 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 584943aa0692fea9ec3356c7d4677dd7a225cdef
refs/heads/master: 2b61d46e2c44568886bc099f8085aefc7107e372
17 changes: 3 additions & 14 deletions trunk/drivers/media/video/atmel-isi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv;
unsigned long size;
int ret, bytes_per_line;
int ret;

/* Reset ISI */
ret = atmel_isi_wait_status(isi, WAIT_ISI_RESET);
Expand All @@ -271,13 +271,7 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
/* Disable all interrupts */
isi_writel(isi, ISI_INTDIS, ~0UL);

bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
return bytes_per_line;

size = bytes_per_line * icd->user_height;
size = icd->sizeimage;

if (!*nbuffers || *nbuffers > MAX_BUFFER_NUM)
*nbuffers = MAX_BUFFER_NUM;
Expand Down Expand Up @@ -316,13 +310,8 @@ static int buffer_prepare(struct vb2_buffer *vb)
struct atmel_isi *isi = ici->priv;
unsigned long size;
struct isi_dma_desc *desc;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
return bytes_per_line;

size = bytes_per_line * icd->user_height;
size = icd->sizeimage;

if (vb2_plane_size(vb, 0) < size) {
dev_err(icd->parent, "%s data will not fit into plane (%lu < %lu)\n",
Expand Down
14 changes: 2 additions & 12 deletions trunk/drivers/media/video/mx1_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,8 @@ static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
unsigned int *size)
{
struct soc_camera_device *icd = vq->priv_data;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
return bytes_per_line;

*size = bytes_per_line * icd->user_height;
*size = icd->sizeimage;

if (!*count)
*count = 32;
Expand Down Expand Up @@ -171,11 +166,6 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
struct soc_camera_device *icd = vq->priv_data;
struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
int ret;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
return bytes_per_line;

dev_dbg(icd->parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
vb, vb->baddr, vb->bsize);
Expand All @@ -202,7 +192,7 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
vb->state = VIDEOBUF_NEEDS_INIT;
}

vb->size = bytes_per_line * vb->height;
vb->size = icd->sizeimage;
if (0 != vb->baddr && vb->bsize < vb->size) {
ret = -EINVAL;
goto out;
Expand Down
14 changes: 2 additions & 12 deletions trunk/drivers/media/video/mx2_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,21 +538,16 @@ static int mx2_videobuf_setup(struct vb2_queue *vq,
struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx2_camera_dev *pcdev = ici->priv;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

dev_dbg(icd->parent, "count=%d, size=%d\n", *count, sizes[0]);

/* TODO: support for VIDIOC_CREATE_BUFS not ready */
if (fmt != NULL)
return -ENOTTY;

if (bytes_per_line < 0)
return bytes_per_line;

alloc_ctxs[0] = pcdev->alloc_ctx;

sizes[0] = bytes_per_line * icd->user_height;
sizes[0] = icd->sizeimage;

if (0 == *count)
*count = 32;
Expand All @@ -568,16 +563,11 @@ static int mx2_videobuf_setup(struct vb2_queue *vq,
static int mx2_videobuf_prepare(struct vb2_buffer *vb)
{
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);
int ret = 0;

dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__,
vb, vb2_plane_vaddr(vb, 0), vb2_get_plane_payload(vb, 0));

if (bytes_per_line < 0)
return bytes_per_line;

#ifdef DEBUG
/*
* This can be useful if you want to see if we actually fill
Expand All @@ -587,7 +577,7 @@ static int mx2_videobuf_prepare(struct vb2_buffer *vb)
0xaa, vb2_get_plane_payload(vb, 0));
#endif

vb2_set_plane_payload(vb, 0, bytes_per_line * icd->user_height);
vb2_set_plane_payload(vb, 0, icd->sizeimage);
if (vb2_plane_vaddr(vb, 0) &&
vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) {
ret = -EINVAL;
Expand Down
20 changes: 9 additions & 11 deletions trunk/drivers/media/video/mx3_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,30 +199,28 @@ static int mx3_videobuf_setup(struct vb2_queue *vq,
struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv;
int bytes_per_line;
unsigned int height;

if (!mx3_cam->idmac_channel[0])
return -EINVAL;

if (fmt) {
const struct soc_camera_format_xlate *xlate = soc_camera_xlate_by_fourcc(icd,
fmt->fmt.pix.pixelformat);
int bytes_per_line;

if (!xlate)
return -EINVAL;

bytes_per_line = soc_mbus_bytes_per_line(fmt->fmt.pix.width,
xlate->host_fmt);
height = fmt->fmt.pix.height;
if (bytes_per_line < 0)
return bytes_per_line;

sizes[0] = bytes_per_line * fmt->fmt.pix.height;
} else {
/* Called from VIDIOC_REQBUFS or in compatibility mode */
bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);
height = icd->user_height;
sizes[0] = icd->sizeimage;
}
if (bytes_per_line < 0)
return bytes_per_line;

sizes[0] = bytes_per_line * height;

alloc_ctxs[0] = mx3_cam->alloc_ctx;

Expand Down Expand Up @@ -274,7 +272,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)

BUG_ON(bytes_per_line <= 0);

new_size = bytes_per_line * icd->user_height;
new_size = icd->sizeimage;

if (vb2_plane_size(vb, 0) < new_size) {
dev_err(icd->parent, "Buffer #%d too small (%lu < %zu)\n",
Expand Down
14 changes: 2 additions & 12 deletions trunk/drivers/media/video/omap1_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,10 @@ static int omap1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
unsigned int *size)
{
struct soc_camera_device *icd = vq->priv_data;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct omap1_cam_dev *pcdev = ici->priv;

if (bytes_per_line < 0)
return bytes_per_line;

*size = bytes_per_line * icd->user_height;
*size = icd->sizeimage;

if (!*count || *count < OMAP1_CAMERA_MIN_BUF_COUNT(pcdev->vb_mode))
*count = OMAP1_CAMERA_MIN_BUF_COUNT(pcdev->vb_mode);
Expand Down Expand Up @@ -256,15 +251,10 @@ static int omap1_videobuf_prepare(struct videobuf_queue *vq,
{
struct soc_camera_device *icd = vq->priv_data;
struct omap1_cam_buf *buf = container_of(vb, struct omap1_cam_buf, vb);
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct omap1_cam_dev *pcdev = ici->priv;
int ret;

if (bytes_per_line < 0)
return bytes_per_line;

WARN_ON(!list_empty(&vb->queue));

BUG_ON(NULL == icd->current_fmt);
Expand All @@ -281,7 +271,7 @@ static int omap1_videobuf_prepare(struct videobuf_queue *vq,
vb->state = VIDEOBUF_NEEDS_INIT;
}

vb->size = bytes_per_line * vb->height;
vb->size = icd->sizeimage;

if (vb->baddr && vb->bsize < vb->size) {
ret = -EINVAL;
Expand Down
14 changes: 2 additions & 12 deletions trunk/drivers/media/video/pxa_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,10 @@ static int pxa_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
unsigned int *size)
{
struct soc_camera_device *icd = vq->priv_data;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
return bytes_per_line;

dev_dbg(icd->parent, "count=%d, size=%d\n", *count, *size);

*size = bytes_per_line * icd->user_height;
*size = icd->sizeimage;

if (0 == *count)
*count = 32;
Expand Down Expand Up @@ -435,11 +430,6 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
int ret;
int size_y, size_u = 0, size_v = 0;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
return bytes_per_line;

dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
vb, vb->baddr, vb->bsize);
Expand Down Expand Up @@ -474,7 +464,7 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
vb->state = VIDEOBUF_NEEDS_INIT;
}

vb->size = bytes_per_line * vb->height;
vb->size = icd->sizeimage;
if (0 != vb->baddr && vb->bsize < vb->size) {
ret = -EINVAL;
goto out;
Expand Down
25 changes: 9 additions & 16 deletions trunk/drivers/media/video/sh_mobile_ceu_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,27 +210,25 @@ static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
struct soc_camera_device *icd = container_of(vq, struct soc_camera_device, vb2_vidq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct sh_mobile_ceu_dev *pcdev = ici->priv;
int bytes_per_line;
unsigned int height;

if (fmt) {
const struct soc_camera_format_xlate *xlate = soc_camera_xlate_by_fourcc(icd,
fmt->fmt.pix.pixelformat);
int bytes_per_line;

if (!xlate)
return -EINVAL;

bytes_per_line = soc_mbus_bytes_per_line(fmt->fmt.pix.width,
xlate->host_fmt);
height = fmt->fmt.pix.height;
if (bytes_per_line < 0)
return bytes_per_line;

sizes[0] = bytes_per_line * fmt->fmt.pix.height;
} else {
/* Called from VIDIOC_REQBUFS or in compatibility mode */
bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);
height = icd->user_height;
sizes[0] = icd->sizeimage;
}
if (bytes_per_line < 0)
return bytes_per_line;

sizes[0] = bytes_per_line * height;

alloc_ctxs[0] = pcdev->alloc_ctx;

Expand Down Expand Up @@ -377,13 +375,8 @@ static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
struct sh_mobile_ceu_dev *pcdev = ici->priv;
struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
unsigned long size;
int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
icd->current_fmt->host_fmt);

if (bytes_per_line < 0)
goto error;

size = icd->user_height * bytes_per_line;
size = icd->sizeimage;

if (vb2_plane_size(vb, 0) < size) {
dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n",
Expand Down

0 comments on commit 08920a0

Please sign in to comment.