projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media: platform: exynos4-is: remove all references to physical addresses
[platform/kernel/linux-starfive.git]
/
drivers
/
media
/
platform
/
exynos4-is
/
fimc-core.c
diff --git
a/drivers/media/platform/exynos4-is/fimc-core.c
b/drivers/media/platform/exynos4-is/fimc-core.c
index
08d1f39
..
bfdee77
100644
(file)
--- a/
drivers/media/platform/exynos4-is/fimc-core.c
+++ b/
drivers/media/platform/exynos4-is/fimc-core.c
@@
-214,11
+214,13
@@
static int fimc_get_scaler_factor(u32 src, u32 tar, u32 *ratio, u32 *shift)
while (sh--) {
u32 tmp = 1 << sh;
if (src >= tar * tmp) {
while (sh--) {
u32 tmp = 1 << sh;
if (src >= tar * tmp) {
- *shift = sh, *ratio = tmp;
+ *shift = sh;
+ *ratio = tmp;
return 0;
}
}
return 0;
}
}
- *shift = 0, *ratio = 1;
+ *shift = 0;
+ *ratio = 1;
return 0;
}
return 0;
}
@@
-325,7
+327,7
@@
out:
/* The color format (colplanes, memplanes) must be already configured. */
int fimc_prepare_addr(struct fimc_ctx *ctx, struct vb2_buffer *vb,
/* The color format (colplanes, memplanes) must be already configured. */
int fimc_prepare_addr(struct fimc_ctx *ctx, struct vb2_buffer *vb,
- struct fimc_frame *frame, struct fimc_addr *
p
addr)
+ struct fimc_frame *frame, struct fimc_addr *addr)
{
int ret = 0;
u32 pix_size;
{
int ret = 0;
u32 pix_size;
@@
-338,42
+340,40
@@
int fimc_prepare_addr(struct fimc_ctx *ctx, struct vb2_buffer *vb,
dbg("memplanes= %d, colplanes= %d, pix_size= %d",
frame->fmt->memplanes, frame->fmt->colplanes, pix_size);
dbg("memplanes= %d, colplanes= %d, pix_size= %d",
frame->fmt->memplanes, frame->fmt->colplanes, pix_size);
-
p
addr->y = vb2_dma_contig_plane_dma_addr(vb, 0);
+ addr->y = vb2_dma_contig_plane_dma_addr(vb, 0);
if (frame->fmt->memplanes == 1) {
switch (frame->fmt->colplanes) {
case 1:
if (frame->fmt->memplanes == 1) {
switch (frame->fmt->colplanes) {
case 1:
-
p
addr->cb = 0;
-
p
addr->cr = 0;
+ addr->cb = 0;
+ addr->cr = 0;
break;
case 2:
/* decompose Y into Y/Cb */
break;
case 2:
/* decompose Y into Y/Cb */
-
paddr->cb = (u32)(p
addr->y + pix_size);
-
p
addr->cr = 0;
+
addr->cb = (u32)(
addr->y + pix_size);
+ addr->cr = 0;
break;
case 3:
break;
case 3:
-
paddr->cb = (u32)(p
addr->y + pix_size);
+
addr->cb = (u32)(
addr->y + pix_size);
/* decompose Y into Y/Cb/Cr */
if (FIMC_FMT_YCBCR420 == frame->fmt->color)
/* decompose Y into Y/Cb/Cr */
if (FIMC_FMT_YCBCR420 == frame->fmt->color)
- paddr->cr = (u32)(paddr->cb
- + (pix_size >> 2));
+ addr->cr = (u32)(addr->cb + (pix_size >> 2));
else /* 422 */
else /* 422 */
- paddr->cr = (u32)(paddr->cb
- + (pix_size >> 1));
+ addr->cr = (u32)(addr->cb + (pix_size >> 1));
break;
default:
return -EINVAL;
}
} else if (!frame->fmt->mdataplanes) {
if (frame->fmt->memplanes >= 2)
break;
default:
return -EINVAL;
}
} else if (!frame->fmt->mdataplanes) {
if (frame->fmt->memplanes >= 2)
-
p
addr->cb = vb2_dma_contig_plane_dma_addr(vb, 1);
+ addr->cb = vb2_dma_contig_plane_dma_addr(vb, 1);
if (frame->fmt->memplanes == 3)
if (frame->fmt->memplanes == 3)
-
p
addr->cr = vb2_dma_contig_plane_dma_addr(vb, 2);
+ addr->cr = vb2_dma_contig_plane_dma_addr(vb, 2);
}
}
- dbg("
PHYS_
ADDR: y= 0x%X cb= 0x%X cr= 0x%X ret= %d",
-
paddr->y, paddr->cb, p
addr->cr, ret);
+ dbg("
DMA
ADDR: y= 0x%X cb= 0x%X cr= 0x%X ret= %d",
+
addr->y, addr->cb,
addr->cr, ret);
return ret;
}
return ret;
}