[media] v4l2-dv-timings: add helpers for vic and pixelaspect ratio (65243076) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/v4l2-core/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,7 @@
	config VIDEO_V4L2		config VIDEO_V4L2
	tristate		tristate
	depends on (I2C \|\| I2C=n) && VIDEO_DEV		depends on (I2C \|\| I2C=n) && VIDEO_DEV
			select RATIONAL
	default (I2C \|\| I2C=n) && VIDEO_DEV		default (I2C \|\| I2C=n) && VIDEO_DEV

	config VIDEO_ADV_DEBUG		config VIDEO_ADV_DEBUG

drivers/media/v4l2-core/v4l2-dv-timings.c

+57 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/errno.h>		#include <linux/errno.h>
			#include <linux/rational.h>
	#include <linux/videodev2.h>		#include <linux/videodev2.h>
	#include <linux/v4l2-dv-timings.h>		#include <linux/v4l2-dv-timings.h>
	#include <media/v4l2-dv-timings.h>		#include <media/v4l2-dv-timings.h>
	@@ -224,6 +225,24 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
	}		}
	EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cap);		EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cap);

			bool v4l2_find_dv_timings_cea861_vic(struct v4l2_dv_timings *t, u8 vic)
			{
			unsigned int i;

			for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) {
			const struct v4l2_bt_timings *bt =
			&v4l2_dv_timings_presets[i].bt;

			if ((bt->flags & V4L2_DV_FL_HAS_CEA861_VIC) &&
			bt->cea861_vic == vic) {
			*t = v4l2_dv_timings_presets[i];
			return true;
			}
			}
			return false;
			}
			EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cea861_vic);

	/**		/**
	* v4l2_match_dv_timings - check if two timings match		* v4l2_match_dv_timings - check if two timings match
	* @t1 - compare this v4l2_dv_timings struct...		* @t1 - compare this v4l2_dv_timings struct...
	@@ -306,7 +325,8 @@ void v4l2_print_dv_timings(const char dev_prefix, const char prefix,
	(bt->polarities & V4L2_DV_VSYNC_POS_POL) ? "+" : "-",		(bt->polarities & V4L2_DV_VSYNC_POS_POL) ? "+" : "-",
	bt->il_vsync, bt->il_vbackporch);		bt->il_vsync, bt->il_vbackporch);
	pr_info("%s: pixelclock: %llu\n", dev_prefix, bt->pixelclock);		pr_info("%s: pixelclock: %llu\n", dev_prefix, bt->pixelclock);
	pr_info("%s: flags (0x%x):%s%s%s%s%s%s%s\n", dev_prefix, bt->flags,		pr_info("%s: flags (0x%x):%s%s%s%s%s%s%s%s%s%s\n",
			dev_prefix, bt->flags,
	(bt->flags & V4L2_DV_FL_REDUCED_BLANKING) ?		(bt->flags & V4L2_DV_FL_REDUCED_BLANKING) ?
	" REDUCED_BLANKING" : "",		" REDUCED_BLANKING" : "",
	((bt->flags & V4L2_DV_FL_REDUCED_BLANKING) &&		((bt->flags & V4L2_DV_FL_REDUCED_BLANKING) &&
	@@ -320,16 +340,51 @@ void v4l2_print_dv_timings(const char dev_prefix, const char prefix,
	(bt->flags & V4L2_DV_FL_IS_CE_VIDEO) ?		(bt->flags & V4L2_DV_FL_IS_CE_VIDEO) ?
	" CE_VIDEO" : "",		" CE_VIDEO" : "",
	(bt->flags & V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE) ?		(bt->flags & V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE) ?
	" FIRST_FIELD_EXTRA_LINE" : "");		" FIRST_FIELD_EXTRA_LINE" : "",
			(bt->flags & V4L2_DV_FL_HAS_PICTURE_ASPECT) ?
			" HAS_PICTURE_ASPECT" : "",
			(bt->flags & V4L2_DV_FL_HAS_CEA861_VIC) ?
			" HAS_CEA861_VIC" : "",
			(bt->flags & V4L2_DV_FL_HAS_HDMI_VIC) ?
			" HAS_HDMI_VIC" : "");
	pr_info("%s: standards (0x%x):%s%s%s%s%s\n", dev_prefix, bt->standards,		pr_info("%s: standards (0x%x):%s%s%s%s%s\n", dev_prefix, bt->standards,
	(bt->standards & V4L2_DV_BT_STD_CEA861) ? " CEA" : "",		(bt->standards & V4L2_DV_BT_STD_CEA861) ? " CEA" : "",
	(bt->standards & V4L2_DV_BT_STD_DMT) ? " DMT" : "",		(bt->standards & V4L2_DV_BT_STD_DMT) ? " DMT" : "",
	(bt->standards & V4L2_DV_BT_STD_CVT) ? " CVT" : "",		(bt->standards & V4L2_DV_BT_STD_CVT) ? " CVT" : "",
	(bt->standards & V4L2_DV_BT_STD_GTF) ? " GTF" : "",		(bt->standards & V4L2_DV_BT_STD_GTF) ? " GTF" : "",
	(bt->standards & V4L2_DV_BT_STD_SDI) ? " SDI" : "");		(bt->standards & V4L2_DV_BT_STD_SDI) ? " SDI" : "");
			if (bt->flags & V4L2_DV_FL_HAS_PICTURE_ASPECT)
			pr_info("%s: picture aspect (hor:vert): %u:%u\n", dev_prefix,
			bt->picture_aspect.numerator,
			bt->picture_aspect.denominator);
			if (bt->flags & V4L2_DV_FL_HAS_CEA861_VIC)
			pr_info("%s: CEA-861 VIC: %u\n", dev_prefix, bt->cea861_vic);
			if (bt->flags & V4L2_DV_FL_HAS_HDMI_VIC)
			pr_info("%s: HDMI VIC: %u\n", dev_prefix, bt->hdmi_vic);
	}		}
	EXPORT_SYMBOL_GPL(v4l2_print_dv_timings);		EXPORT_SYMBOL_GPL(v4l2_print_dv_timings);

			struct v4l2_fract v4l2_dv_timings_aspect_ratio(const struct v4l2_dv_timings *t)
			{
			struct v4l2_fract ratio = { 1, 1 };
			unsigned long n, d;

			if (t->type != V4L2_DV_BT_656_1120)
			return ratio;
			if (!(t->bt.flags & V4L2_DV_FL_HAS_PICTURE_ASPECT))
			return ratio;

			ratio.numerator = t->bt.width * t->bt.picture_aspect.denominator;
			ratio.denominator = t->bt.height * t->bt.picture_aspect.numerator;

			rational_best_approximation(ratio.numerator, ratio.denominator,
			ratio.numerator, ratio.denominator, &n, &d);
			ratio.numerator = n;
			ratio.denominator = d;
			return ratio;
			}
			EXPORT_SYMBOL_GPL(v4l2_dv_timings_aspect_ratio);

	/*		/*
	* CVT defines		* CVT defines
	* Based on Coordinated Video Timings Standard		* Based on Coordinated Video Timings Standard

include/media/v4l2-dv-timings.h

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,16 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
	v4l2_check_dv_timings_fnc fnc,		v4l2_check_dv_timings_fnc fnc,
	void *fnc_handle);		void *fnc_handle);

			/**
			* v4l2_find_dv_timings_cea861_vic() - find timings based on CEA-861 VIC
			* @t: the timings data.
			* @vic: CEA-861 VIC code
			*
			* On success it will fill in @t with the found timings and it returns true.
			* On failure it will return false.
			*/
			bool v4l2_find_dv_timings_cea861_vic(struct v4l2_dv_timings *t, u8 vic);

	/**		/**
	* v4l2_match_dv_timings() - do two timings match?		* v4l2_match_dv_timings() - do two timings match?
	*		*
	@@ -185,6 +195,14 @@ bool v4l2_detect_gtf(unsigned frame_height, unsigned hfreq, unsigned vsync,
	*/		*/
	struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait);		struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait);

			/**
			* v4l2_dv_timings_aspect_ratio - calculate the aspect ratio based on the
			* v4l2_dv_timings information.
			*
			* @t: the timings data.
			*/
			struct v4l2_fract v4l2_dv_timings_aspect_ratio(const struct v4l2_dv_timings *t);

	/*		/*
	* reduce_fps - check if conditions for reduced fps are true.		* reduce_fps - check if conditions for reduced fps are true.
	* bt - v4l2 timing structure		* bt - v4l2 timing structure