Merge "msm: vidc: Reorganize bus vote module in video" (d746bddb) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/vidc/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@ msm-vidc-objs := msm_v4l2_vidc.o \
		hfi_packetization.o \
		vidc_hfi.o \
		msm_vidc_clocks.o \
		msm_vidc_ar50_dyn_gov.o \
		msm_vidc_dyn_gov.o \
		msm_vidc_bus_iris1.o \
		msm_vidc_bus_iris2.o \
		msm_vidc_buffer_calculations.o

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

drivers/media/platform/msm/vidc/fixedpoint.h

+4 −1

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

		#ifdef _FIXP_ARITH_H
		@@ -10,6 +10,9 @@
		#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

drivers/media/platform/msm/vidc/msm_vidc_ar50_dyn_gov.c

deleted100644 → 0

+0 −974

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/vidc/msm_vidc_bus.h

0 → 100644

+283 −0

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

		#ifndef __H_MSM_VIDC_BUS_DEFS_H__
		#define __H_MSM_VIDC_BUS_DEFS_H__

		#include "fixedpoint.h"
		#include "msm_vidc_debug.h"
		#include "vidc_hfi_api.h"

		#define COMPRESSION_RATIO_MAX 5

		enum vidc_bus_type {
		PERF,
		DDR,
		LLCC,
		};

		/*
		* Minimum dimensions for which to calculate bandwidth.
		* This means that anything bandwidth(0, 0) ==
		* bandwidth(BASELINE_DIMENSIONS.width, BASELINE_DIMENSIONS.height)
		*/
		static const struct {
		int height, width;
		} BASELINE_DIMENSIONS = {
		.width = 1280,
		.height = 720,
		};

		/* converts Mbps to bps (the "b" part can be bits or bytes based on context) */
		#define kbps(__mbps) ((__mbps) * 1000)
		#define bps(__mbps) (kbps(__mbps) * 1000)

		#define GENERATE_COMPRESSION_PROFILE(__bpp, __worst) { \
		.bpp = __bpp, \
		.ratio = __worst, \
		}

		/*
		* The below table is a structural representation of the following table:
		* Resolution \| Bitrate \| Compression Ratio \|
		* ............\|............\|.........................................\|
		* Width Height\|Average High\|Avg_8bpc Worst_8bpc Avg_10bpc Worst_10bpc\|
		* 1280 720\| 7 14\| 1.69 1.28 1.49 1.23\|
		* 1920 1080\| 20 40\| 1.69 1.28 1.49 1.23\|
		* 2560 1440\| 32 64\| 2.2 1.26 1.97 1.22\|
		* 3840 2160\| 42 84\| 2.2 1.26 1.97 1.22\|
		* 4096 2160\| 44 88\| 2.2 1.26 1.97 1.22\|
		* 4096 2304\| 48 96\| 2.2 1.26 1.97 1.22\|
		*/
		static struct lut {
		int frame_size; /* width x height */
		int frame_rate;
		unsigned long bitrate;
		struct {
		int bpp;
		fp_t ratio;
		} compression_ratio[COMPRESSION_RATIO_MAX];
		} const LUT[] = {
		{
		.frame_size = 1280 * 720,
		.frame_rate = 30,
		.bitrate = 14,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 1280 * 720,
		.frame_rate = 60,
		.bitrate = 22,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 1920 * 1088,
		.frame_rate = 30,
		.bitrate = 40,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 1920 * 1088,
		.frame_rate = 60,
		.bitrate = 64,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 2560 * 1440,
		.frame_rate = 30,
		.bitrate = 64,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 2560 * 1440,
		.frame_rate = 60,
		.bitrate = 102,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 3840 * 2160,
		.frame_rate = 30,
		.bitrate = 84,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 3840 * 2160,
		.frame_rate = 60,
		.bitrate = 134,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2160,
		.frame_rate = 30,
		.bitrate = 88,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2160,
		.frame_rate = 60,
		.bitrate = 141,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2304,
		.frame_rate = 30,
		.bitrate = 96,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2304,
		.frame_rate = 60,
		.bitrate = 154,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		};

		static inline u32 get_type_frm_name(char *name)
		{
		if (!strcmp(name, "venus-llcc"))
		return LLCC;
		else if (!strcmp(name, "venus-ddr"))
		return DDR;
		else
		return PERF;
		}

		#define DUMP_HEADER_MAGIC 0xdeadbeef
		#define DUMP_FP_FMT "%FP" /* special format for fp_t */

		struct dump {
		char *key;
		char *format;
		size_t val;
		};

		struct vidc_bus_vote_data {
		enum hal_domain domain;
		enum hal_video_codec codec;
		enum hal_uncompressed_format color_formats[2];
		int num_formats; /* 1 = DPB-OPB unified; 2 = split */
		int input_height, input_width, bitrate;
		int output_height, output_width;
		int rotation;
		int compression_ratio;
		int complexity_factor;
		int input_cr;
		u32 ddr_bw;
		u32 sys_cache_bw;
		bool use_dpb_read;
		unsigned int lcu_size;
		unsigned int fps;
		enum msm_vidc_power_mode power_mode;
		u32 work_mode;
		bool use_sys_cache;
		bool b_frames_enabled;
		};

		struct msm_vidc_bus_data {
		struct vidc_bus_vote_data *data;
		u32 data_count;
		unsigned long (calc_bw)(struct bus_info bus,
		struct msm_vidc_bus_data *data);
		};

		unsigned long calc_bw_iris1(struct bus_info *bus,
		struct msm_vidc_bus_data *vidc_data);

		unsigned long calc_bw_iris2(struct bus_info *bus,
		struct msm_vidc_bus_data *vidc_data);

		struct lut const *__lut(int width, int height, int fps);
		fp_t __compression_ratio(struct lut const *entry, int bpp);
		void __dump(struct dump dump[], int len);

		static inline bool __ubwc(enum hal_uncompressed_format f)
		{
		switch (f) {
		case HAL_COLOR_FORMAT_NV12_UBWC:
		case HAL_COLOR_FORMAT_NV12_TP10_UBWC:
		return true;
		default:
		return false;
		}
		}

		static inline int __bpp(enum hal_uncompressed_format f)
		{
		switch (f) {
		case HAL_COLOR_FORMAT_NV12:
		case HAL_COLOR_FORMAT_NV21:
		case HAL_COLOR_FORMAT_NV12_UBWC:
		return 8;
		case HAL_COLOR_FORMAT_NV12_TP10_UBWC:
		case HAL_COLOR_FORMAT_P010:
		return 10;
		default:
		dprintk(VIDC_ERR,
		"Unsupported colorformat (%x)", f);
		return INT_MAX;
		}
		}

		#endif // __H_MSM_VIDC_BUS_DEFS_H__

drivers/media/platform/msm/vidc/msm_vidc_dyn_gov.c→drivers/media/platform/msm/vidc/msm_vidc_bus_iris1.c

+15 −246

Original line number	Diff line number	Diff line
		@@ -3,205 +3,10 @@
		* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
		*/

		#include "msm_vidc_debug.h"
		#include "fixedpoint.h"
		#include "msm_vidc_bus.h"
		#include "msm_vidc_internal.h"
		#include "vidc_hfi_api.h"
		#define COMPRESSION_RATIO_MAX 5

		enum vidc_bus_type {
		PERF,
		DDR,
		LLCC,
		};

		/*
		* Minimum dimensions for which to calculate bandwidth.
		* This means that anything bandwidth(0, 0) ==
		* bandwidth(BASELINE_DIMENSIONS.width, BASELINE_DIMENSIONS.height)
		*/
		static const struct {
		int height, width;
		} BASELINE_DIMENSIONS = {
		.width = 1280,
		.height = 720,
		};

		/* converts Mbps to bps (the "b" part can be bits or bytes based on context) */
		#define kbps(__mbps) ((__mbps) * 1000)
		#define bps(__mbps) (kbps(__mbps) * 1000)

		#define GENERATE_COMPRESSION_PROFILE(__bpp, __worst) { \
		.bpp = __bpp, \
		.ratio = __worst, \
		}

		/*
		* The below table is a structural representation of the following table:
		* Resolution \| Bitrate \| Compression Ratio \|
		* ............\|............\|.........................................\|
		* Width Height\|Average High\|Avg_8bpc Worst_8bpc Avg_10bpc Worst_10bpc\|
		* 1280 720\| 7 14\| 1.69 1.28 1.49 1.23\|
		* 1920 1080\| 20 40\| 1.69 1.28 1.49 1.23\|
		* 2560 1440\| 32 64\| 2.2 1.26 1.97 1.22\|
		* 3840 2160\| 42 84\| 2.2 1.26 1.97 1.22\|
		* 4096 2160\| 44 88\| 2.2 1.26 1.97 1.22\|
		* 4096 2304\| 48 96\| 2.2 1.26 1.97 1.22\|
		*/
		static struct lut {
		int frame_size; /* width x height */
		int frame_rate;
		unsigned long bitrate;
		struct {
		int bpp;
		fp_t ratio;
		} compression_ratio[COMPRESSION_RATIO_MAX];
		} const LUT[] = {
		{
		.frame_size = 1280 * 720,
		.frame_rate = 30,
		.bitrate = 14,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 1280 * 720,
		.frame_rate = 60,
		.bitrate = 22,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 1920 * 1088,
		.frame_rate = 30,
		.bitrate = 40,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 1920 * 1088,
		.frame_rate = 60,
		.bitrate = 64,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 28, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 23, 100)),
		}
		},
		{
		.frame_size = 2560 * 1440,
		.frame_rate = 30,
		.bitrate = 64,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 2560 * 1440,
		.frame_rate = 60,
		.bitrate = 102,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 3840 * 2160,
		.frame_rate = 30,
		.bitrate = 84,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 3840 * 2160,
		.frame_rate = 60,
		.bitrate = 134,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2160,
		.frame_rate = 30,
		.bitrate = 88,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2160,
		.frame_rate = 60,
		.bitrate = 141,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2304,
		.frame_rate = 30,
		.bitrate = 96,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		{
		.frame_size = 4096 * 2304,
		.frame_rate = 60,
		.bitrate = 154,
		.compression_ratio = {
		GENERATE_COMPRESSION_PROFILE(8,
		FP(1, 26, 100)),
		GENERATE_COMPRESSION_PROFILE(10,
		FP(1, 22, 100)),
		}
		},
		};

		static u32 get_type_frm_name(char *name)
		{
		if (!strcmp(name, "venus-llcc"))
		return LLCC;
		else if (!strcmp(name, "venus-ddr"))
		return DDR;
		else
		return PERF;
		}

		static struct lut const *__lut(int width, int height, int fps)
		struct lut const *__lut(int width, int height, int fps)
		{
		int frame_size = height * width, c = 0;

		@@ -213,7 +18,7 @@ static struct lut const *__lut(int width, int height, int fps)
		return &LUT[ARRAY_SIZE(LUT) - 1];
		}

		static fp_t __compression_ratio(struct lut const *entry, int bpp)
		fp_t __compression_ratio(struct lut const *entry, int bpp)
		{
		int c = 0;

		@@ -226,15 +31,7 @@ static fp_t __compression_ratio(struct lut const *entry, int bpp)
		return FP_ZERO; /* impossible */
		}

		#define DUMP_HEADER_MAGIC 0xdeadbeef
		#define DUMP_FP_FMT "%FP" /* special format for fp_t */
		struct dump {
		char *key;
		char *format;
		size_t val;
		};

		static void __dump(struct dump dump[], int len)
		void __dump(struct dump dump[], int len)
		{
		int c = 0;

		@@ -267,6 +64,7 @@ static void __dump(struct dump dump[], int len)

		}
		}
		dprintk(VIDC_DBG, "%s", formatted_line);
		}
		}

		@@ -289,42 +87,13 @@ static unsigned long __calculate_cvp(struct vidc_bus_vote_data *d,
		ret = d->sys_cache_bw;
		break;
		default:
		dprintk(VIDC_ERR, "%s - Unknown governor\n", __func__);
		dprintk(VIDC_ERR, "%s - Unknown type\n", __func__);
		break;
		}

		return ret;
		}

		static bool __ubwc(enum hal_uncompressed_format f)
		{
		switch (f) {
		case HAL_COLOR_FORMAT_NV12_UBWC:
		case HAL_COLOR_FORMAT_NV12_TP10_UBWC:
		return true;
		default:
		return false;
		}
		}

		static int __bpp(enum hal_uncompressed_format f)
		{
		switch (f) {
		case HAL_COLOR_FORMAT_NV12:
		case HAL_COLOR_FORMAT_NV21:
		case HAL_COLOR_FORMAT_NV12_UBWC:
		return 8;
		case HAL_COLOR_FORMAT_NV12_TP10_UBWC:
		case HAL_COLOR_FORMAT_P010:
		return 10;
		default:
		dprintk(VIDC_ERR,
		"What's this? We don't support this colorformat (%x)",
		f);
		return INT_MAX;
		}
		}

		static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d,
		enum vidc_bus_type type)
		{
		@@ -427,10 +196,9 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d,
		lcu_per_frame = DIV_ROUND_UP(width, lcu_size) *
		DIV_ROUND_UP(height, lcu_size);

		bitrate = __lut(width, height, fps)->bitrate;
		bitrate = (d->bitrate + 1000000 - 1) / 1000000;

		bins_to_bit_factor = FP_INT(4);

		vsp_write_factor = bins_to_bit_factor;
		vsp_read_factor = bins_to_bit_factor + FP_INT(2);

		@@ -575,7 +343,7 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d,
		ret = kbps(fp_round(llc.total));
		break;
		default:
		dprintk(VIDC_ERR, "%s - Unknown governor\n", __func__);
		dprintk(VIDC_ERR, "%s - Unknown type\n", __func__);
		}

		return ret;
		@@ -592,9 +360,9 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		/* Encoder Parameters */
		int width, height, fps, lcu_size, bitrate, lcu_per_frame,
		collocated_bytes_per_lcu, tnbr_per_lcu, dpb_bpp,
		original_color_format, vertical_tile_width, rotation;
		original_color_format, vertical_tile_width;
		bool work_mode_1, original_compression_enabled,
		low_power, cropping_or_scaling,
		low_power, rotation, cropping_or_scaling,
		b_frames_enabled = false,
		llc_ref_chroma_cache_enabled = false,
		llc_top_line_buf_enabled = false,
		@@ -643,7 +411,7 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		downscaling_ratio = fp_div(FP_INT(d->input_width * d->input_height),
		FP_INT(d->output_width * d->output_height));
		downscaling_ratio = max(downscaling_ratio, FP_ONE);
		bitrate = d->bitrate > 0 ? d->bitrate / 1000000 :
		bitrate = d->bitrate > 0 ? (d->bitrate + 1000000 - 1) / 1000000 :
		__lut(width, height, fps)->bitrate;
		lcu_size = d->lcu_size;
		lcu_per_frame = DIV_ROUND_UP(width, lcu_size) *
		@@ -872,7 +640,7 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		ret = kbps(fp_round(llc.total));
		break;
		default:
		dprintk(VIDC_ERR, "%s - Unknown governor\n", __func__);
		dprintk(VIDC_ERR, "%s - Unknown type\n", __func__);
		}

		return ret;
		@@ -903,8 +671,8 @@ static unsigned long __calculate(struct vidc_bus_vote_data *d,
		return value;
		}

		unsigned long __calc_bw(struct bus_info *bus,
		struct msm_vidc_gov_data *vidc_data)
		unsigned long calc_bw_iris1(struct bus_info *bus,
		struct msm_vidc_bus_data *vidc_data)
		{
		unsigned long ab_kbps = 0, c = 0;
		enum vidc_bus_type type;
		@@ -928,3 +696,4 @@ unsigned long __calc_bw(struct bus_info *bus,
		trace_msm_vidc_perf_bus_vote(bus->name, ab_kbps);
		return ab_kbps;
		}