diff options
| author | Arun Kumar K <arun.kk@samsung.com> | 2012-10-03 22:19:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 22:44:40 -0300 |
| commit | 77a788fc2d4089c64eb355a004f1f16b22eb3ab1 (patch) | |
| tree | 57375840139518336f610247f422f5fa0094b19e /drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | |
| parent | 2e81dde94316dfaa19f0b6f9d4131ef7eaf124a3 (diff) | |
| download | linux-3.10-77a788fc2d4089c64eb355a004f1f16b22eb3ab1.tar.gz linux-3.10-77a788fc2d4089c64eb355a004f1f16b22eb3ab1.tar.bz2 linux-3.10-77a788fc2d4089c64eb355a004f1f16b22eb3ab1.zip | |
[media] s5p-mfc: Prepare driver for callback based re-architecture
The patch renames hardware specific opr and cmd files to
opr_v5 and cmd_v5 respectively. This is done for accomodating
firmware v6. Also the shared memory management files are removed
and the functionality is added to the opr_v5 file.
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Acked-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_dec.c')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 6ee21bb7139..653f14bca38 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -28,9 +28,8 @@ #include "s5p_mfc_debug.h" #include "s5p_mfc_dec.h" #include "s5p_mfc_intr.h" -#include "s5p_mfc_opr.h" +#include "s5p_mfc_opr_v5.h" #include "s5p_mfc_pm.h" -#include "s5p_mfc_shm.h" static struct s5p_mfc_fmt formats[] = { { @@ -695,10 +694,10 @@ static int vidioc_g_crop(struct file *file, void *priv, return -EINVAL; } if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_H264) { - left = s5p_mfc_read_shm(ctx, CROP_INFO_H); + left = s5p_mfc_read_info_v5(ctx, CROP_INFO_H); right = left >> S5P_FIMV_SHARED_CROP_RIGHT_SHIFT; left = left & S5P_FIMV_SHARED_CROP_LEFT_MASK; - top = s5p_mfc_read_shm(ctx, CROP_INFO_V); + top = s5p_mfc_read_info_v5(ctx, CROP_INFO_V); bottom = top >> S5P_FIMV_SHARED_CROP_BOTTOM_SHIFT; top = top & S5P_FIMV_SHARED_CROP_TOP_MASK; cr->c.left = left; |