Merge "msm: camera: jpegdma: fix compilation issues for sdm660" (fb7ed6aa) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c

+34 −19

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -71,6 +71,18 @@ static const struct msm_jpegdma_block msm_jpegdma_block_sel[] = {
		},
		};

		/*
		* jpegdma_do_div - long division.
		* @num: dividend
		* @den: divisor
		* returns quotient value.
		*/
		static inline long long jpegdma_do_div(long long num, long long den)
		{
		do_div(num, den);
		return num;
		}

		/*
		* msm_jpegdma_hw_read_reg - dma read from register.
		* @dma: Pointer to dma device.
		@@ -819,9 +831,9 @@ static int msm_jpegdma_hw_calc_speed(struct msm_jpegdma_device *dma,
		}

		speed->bus_ab = calc_rate * 2;
		speed->bus_ib = (real_clock *
		(MSM_JPEGDMA_BW_NUM + MSM_JPEGDMA_BW_DEN - 1)) /
		MSM_JPEGDMA_BW_DEN;
		speed->bus_ib = jpegdma_do_div((real_clock *
		(MSM_JPEGDMA_BW_NUM + MSM_JPEGDMA_BW_DEN - 1)),
		MSM_JPEGDMA_BW_DEN);
		speed->core_clock = real_clock;
		dev_dbg(dma->dev, "Speed core clk %llu ab %llu ib %llu fps %d\n",
		speed->core_clock, speed->bus_ab, speed->bus_ib, size->fps);
		@@ -923,13 +935,15 @@ static int msm_jpegdma_hw_calc_config(struct msm_jpegdma_size_config *size_cfg,

		in_width = size_cfg->in_size.width;
		out_width = size_cfg->out_size.width;
		scale_hor = (in_width * MSM_JPEGDMA_SCALE_UNI) / out_width;
		scale_hor = jpegdma_do_div((in_width * MSM_JPEGDMA_SCALE_UNI),
		out_width);
		if (scale_hor != MSM_JPEGDMA_SCALE_UNI)
		config->scale_cfg.enable = 1;

		in_height = size_cfg->in_size.height;
		out_height = size_cfg->out_size.height;
		scale_ver = (in_height * MSM_JPEGDMA_SCALE_UNI) / out_height;
		scale_ver = jpegdma_do_div((in_height * MSM_JPEGDMA_SCALE_UNI),
		out_height);
		if (scale_ver != MSM_JPEGDMA_SCALE_UNI)
		config->scale_cfg.enable = 1;

		@@ -946,23 +960,23 @@ static int msm_jpegdma_hw_calc_config(struct msm_jpegdma_size_config *size_cfg,
		config->block_cfg.block = msm_jpegdma_block_sel[i];

		if (plane->active_pipes > 1) {
		phase = (out_height * scale_ver + (plane->active_pipes - 1)) /
		plane->active_pipes;
		phase = jpegdma_do_div((out_height * scale_ver +
		(plane->active_pipes - 1)), plane->active_pipes);
		phase &= (MSM_JPEGDMA_SCALE_UNI - 1);
		out_height = (out_height + (plane->active_pipes - 1)) /
		plane->active_pipes;
		out_height = jpegdma_do_div((out_height +
		(plane->active_pipes - 1)), plane->active_pipes);
		in_height = (out_height * scale_ver) / MSM_JPEGDMA_SCALE_UNI;
		}

		config->block_cfg.blocks_per_row = out_width /
		config->block_cfg.block.width;
		config->block_cfg.blocks_per_row = (uint32_t) jpegdma_do_div(out_width,
		config->block_cfg.block.width);

		config->block_cfg.blocks_per_col = out_height;

		config->block_cfg.h_step = config->block_cfg.block.width;

		config->block_cfg.h_step_last = out_width %
		config->block_cfg.block.width;
		config->size_cfg.out_size.width = out_width;
		config->block_cfg.h_step_last = (uint32_t) do_div(out_width,
		config->block_cfg.block.width);
		if (!config->block_cfg.h_step_last)
		config->block_cfg.h_step_last = config->block_cfg.h_step;
		else
		@@ -974,7 +988,6 @@ static int msm_jpegdma_hw_calc_config(struct msm_jpegdma_size_config *size_cfg,
		config->size_cfg = *size_cfg;
		config->size_cfg.in_size.width = in_width;
		config->size_cfg.in_size.height = in_height;
		config->size_cfg.out_size.width = out_width;
		config->size_cfg.out_size.height = out_height;
		config->in_offset = 0;
		config->out_offset = 0;
		@@ -1013,14 +1026,16 @@ int msm_jpegdma_hw_check_config(struct msm_jpegdma_device *dma,

		in_width = size_cfg->in_size.width;
		out_width = size_cfg->out_size.width;
		scale = ((in_width * MSM_JPEGDMA_SCALE_UNI)) / out_width;
		scale = jpegdma_do_div(((in_width * MSM_JPEGDMA_SCALE_UNI)),
		out_width);
		if (scale < MSM_JPEGDMA_SCALE_UNI)
		return -EINVAL;


		in_height = size_cfg->in_size.height;
		out_height = size_cfg->out_size.height;
		scale = (in_height * MSM_JPEGDMA_SCALE_UNI) / out_height;
		scale = jpegdma_do_div((in_height * MSM_JPEGDMA_SCALE_UNI),
		out_height);
		if (scale < MSM_JPEGDMA_SCALE_UNI)
		return -EINVAL;

		@@ -1827,7 +1842,7 @@ int msm_jpegdma_hw_map_buffer(struct msm_jpegdma_device *dma, int fd,
		buf->fd = fd;

		ret = cam_smmu_get_phy_addr(dma->iommu_hndl, buf->fd,
		CAM_SMMU_MAP_RW, &buf->addr, &buf->size);
		CAM_SMMU_MAP_RW, &buf->addr, (size_t *)&buf->size);
		if (ret < 0) {
		dev_err(dma->dev, "Can not get physical address\n");
		goto error_get_phy;