From: Cho KyongHo Date: Tue, 15 Sep 2015 01:40:19 +0000 (+0900) Subject: [COMMON] media: smfc: remove REG_MAIN_MAX_STREAM_SIZE register X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d50b49d30b6ebda9fa14f856031c848414a1c25;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] media: smfc: remove REG_MAIN_MAX_STREAM_SIZE register It now no longer exists and was for lossless JPEG compression that was an experimental feature of SMFC. But lossless JPEG compression is not supported by SMFC in public. Change-Id: I7c0c2e32b9ea5a37e510d99c9df7af70b3df624e Signed-off-by: Cho KyongHo --- diff --git a/drivers/media/platform/exynos/smfc/smfc-regs.c b/drivers/media/platform/exynos/smfc/smfc-regs.c index ceda9d57721a..e4bcba78a88c 100644 --- a/drivers/media/platform/exynos/smfc/smfc-regs.c +++ b/drivers/media/platform/exynos/smfc/smfc-regs.c @@ -383,17 +383,6 @@ void smfc_hwconfigure_image(struct smfc_ctx *ctx, streamsize = ALIGN(streamsize, burstlen); streamsize >>= ctx->smfc->devdata->burstlenth_bits; __raw_writel(streamsize, ctx->smfc->reg + REG_MAIN_STREAM_SIZE); - } else if (smfc_is_capable(ctx->smfc, - V4L2_CAP_EXYNOS_JPEG_MAX_STREAMSIZE)) { - u32 maxstreamsize = vb2_plane_size(&vb2buf_jpg->vb2_buf, 0); - - maxstreamsize = round_down(maxstreamsize, SMFC_STREAMSIZE_ALIGN); - if (!IS_ALIGNED(stream_address, 16)) - maxstreamsize += - SMFC_EXTRA_STREAMSIZE(stream_address, burstlen); - - __raw_writel(maxstreamsize, - ctx->smfc->reg + REG_MAIN_MAX_STREAM_SIZE); } } diff --git a/drivers/media/platform/exynos/smfc/smfc-regs.h b/drivers/media/platform/exynos/smfc/smfc-regs.h index 18e141a778b2..e6db4a0b3b70 100644 --- a/drivers/media/platform/exynos/smfc/smfc-regs.h +++ b/drivers/media/platform/exynos/smfc/smfc-regs.h @@ -61,7 +61,6 @@ #define REG_MAIN_IMAGE_FORMAT 0x040 #define REG_MAIN_STREAM_SIZE 0x044 #define REG_SEC_STREAM_SIZE 0x0BC -#define REG_MAIN_MAX_STREAM_SIZE 0x06C #define REG_IP_VERSION_NUMBER 0x064 diff --git a/drivers/media/platform/exynos/smfc/smfc.c b/drivers/media/platform/exynos/smfc/smfc.c index a319336534cf..519ceb02362f 100644 --- a/drivers/media/platform/exynos/smfc/smfc.c +++ b/drivers/media/platform/exynos/smfc/smfc.c @@ -755,7 +755,6 @@ static int __attribute__((unused)) smfc_iommu_fault_handler( static const struct smfc_device_data smfc_8890_data = { .device_caps = V4L2_CAP_EXYNOS_JPEG_B2B_COMPRESSION | V4L2_CAP_EXYNOS_JPEG_HWFC - | V4L2_CAP_EXYNOS_JPEG_MAX_STREAMSIZE | V4L2_CAP_EXYNOS_JPEG_NO_STREAMBASE_ALIGN | V4L2_CAP_EXYNOS_JPEG_NO_IMAGEBASE_ALIGN | V4L2_CAP_EXYNOS_JPEG_DECOMPRESSION,