Merge "msm: vidc: Removing video driver from base kernel" (b9deee28) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,5 @@ menuconfig SPECTRA_CAMERA

		source "drivers/media/platform/msm/cvp/Kconfig"
		source "drivers/media/platform/msm/sde/Kconfig"
		source "drivers/media/platform/msm/vidc/Kconfig"
		source "drivers/media/platform/msm/npu/Kconfig"
		source "drivers/media/platform/msm/synx/Kconfig"

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,6 +7,5 @@ obj-$(CONFIG_SPECTRA_CAMERA) += camera/
		# based on V4L2.
		#
		obj-$(CONFIG_MSM_CVP_V4L2) += cvp/
		obj-$(CONFIG_MSM_VIDC_V4L2) += vidc/
		obj-$(CONFIG_MSM_NPU) += npu/
		obj-$(CONFIG_MSM_GLOBAL_SYNX) += synx/

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		#
		# VIDEO CORE
		#

		menuconfig MSM_VIDC_V4L2
		tristate "Qualcomm Technologies, Inc. MSM V4L2 based video driver"
		depends on ARCH_QCOM && VIDEO_V4L2
		select VIDEOBUF2_CORE
		help
		Enable support of MSM V4L2 video driver for
		Qualcomm Technologies, Inc.

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		ccflags-y += -I$(srctree)/drivers/media/platform/msm/vidc/ \
		-I$(srctree)/drivers/devfreq/

		msm-vidc-objs := msm_v4l2_vidc.o \
		msm_v4l2_private.o \
		msm_vidc_platform.o \
		msm_vidc_common.o \
		msm_vidc.o \
		msm_vdec.o \
		msm_venc.o \
		msm_cvp_internal.o \
		msm_cvp_external.o \
		msm_smem.o \
		msm_vidc_debug.o \
		msm_vidc_res_parse.o \
		hfi_common.o \
		hfi_ar50.o \
		hfi_iris1.o \
		hfi_iris2.o \
		hfi_response_handler.o \
		hfi_packetization.o \
		vidc_hfi.o \
		msm_vidc_clocks.o \
		msm_vidc_bus_iris1.o \
		msm_vidc_bus_iris2.o \
		msm_vidc_buffer_calculations.o

		obj-$(CONFIG_MSM_VIDC_V4L2) := msm-vidc.o

deleted100644 → 0

+0 −68

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		/*
		* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
		*/

		#ifdef _FIXP_ARITH_H
		#error "This implementation is meant to override fixp-arith.h, don't use both"
		#endif

		#ifndef _FIXEDPOINT_H_
		#define _FIXEDPOINT_H_

		#include <linux/types.h>
		#include <linux/bits.h>

		/*
		* Normally would typedef'ed, but checkpatch doesn't like typedef.
		* Also should be normally typedef'ed to intmax_t but that doesn't seem to be
		* available in the kernel
		*/
		#define fp_t size_t

		/* (Arbitrarily) make the first 25% of the bits to be the fractional bits */
		#define FP_FRACTIONAL_BITS ((sizeof(fp_t) * 8) / 4)

		#define FP(__i, __f_n, __f_d) \
		((((fp_t)(__i)) << FP_FRACTIONAL_BITS) + \
		(((__f_n) << FP_FRACTIONAL_BITS) / (__f_d)))

		#define FP_INT(__i) FP(__i, 0, 1)
		#define FP_ONE FP_INT(1)
		#define FP_ZERO FP_INT(0)

		static inline size_t fp_frac_base(void)
		{
		return GENMASK(FP_FRACTIONAL_BITS - 1, 0);
		}

		static inline size_t fp_frac(fp_t a)
		{
		return a & GENMASK(FP_FRACTIONAL_BITS - 1, 0);
		}

		static inline size_t fp_int(fp_t a)
		{
		return a >> FP_FRACTIONAL_BITS;
		}

		static inline size_t fp_round(fp_t a)
		{
		/* is the fractional part >= frac_max / 2? */
		bool round_up = fp_frac(a) >= fp_frac_base() / 2;

		return fp_int(a) + round_up;
		}

		static inline fp_t fp_mult(fp_t a, fp_t b)
		{
		return (a * b) >> FP_FRACTIONAL_BITS;
		}


		static inline fp_t fp_div(fp_t a, fp_t b)
		{
		return (a << FP_FRACTIONAL_BITS) / b;
		}

		#endif