Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d33676f authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-0455ac9d' into 4.9" into msm-4.9

parents 514a2c6a e682dcb1

Documentation/media/uapi/v4l/pixfmt-007.rst

+17 −6
Original line number Diff line number Diff line
@@ -211,7 +211,13 @@ Colorspace sRGB (V4L2_COLORSPACE_SRGB) 
The :ref:`srgb` standard defines the colorspace used by most webcams

and computer graphics. The default transfer function is

``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full range.

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited range.



Note that the :ref:`sycc` standard specifies full range quantization,

however all current capture hardware supported by the kernel convert

R'G'B' to limited range Y'CbCr. So choosing full range as the default

would break how applications interpret the quantization range.



The chromaticities of the primary colors and the white reference are:
@@ -276,7 +282,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding as defined by :ref:`sycc`: 


Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range

[-0.5…0.5]. This transform is identical to one defined in SMPTE

170M/BT.601. The Y'CbCr quantization is full range.

170M/BT.601. The Y'CbCr quantization is limited range.





.. _col-adobergb:
@@ -288,10 +294,15 @@ The :ref:`adobergb` standard defines the colorspace used by computer 
graphics that use the AdobeRGB colorspace. This is also known as the

:ref:`oprgb` standard. The default transfer function is

``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full

range. The chromaticities of the primary colors and the white reference

are:

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited

range.



Note that the :ref:`oprgb` standard specifies full range quantization,

however all current capture hardware supported by the kernel convert

R'G'B' to limited range Y'CbCr. So choosing full range as the default

would break how applications interpret the quantization range.



The chromaticities of the primary colors and the white reference are:





.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
@@ -344,7 +355,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding: 


Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range

[-0.5…0.5]. This transform is identical to one defined in SMPTE

170M/BT.601. The Y'CbCr quantization is full range.

170M/BT.601. The Y'CbCr quantization is limited range.





.. _col-bt2020:

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 9

SUBLEVEL = 12

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/kernel/unaligned.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs, 


	/* clear any remanants of delay slot */

	if (delay_mode(regs)) {

		regs->ret = regs->bta ~1U;

		regs->ret = regs->bta & ~1U;

		regs->status32 &= ~STATUS_DE_MASK;

	} else {

		regs->ret += state.instr_len;

arch/arm/boot/dts/imx6dl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
&gpio4 {

	gpio-ranges = <&iomuxc  5 136 1>, <&iomuxc  6 145 1>, <&iomuxc  7 150 1>,

		      <&iomuxc  8 146 1>, <&iomuxc  9 151 1>, <&iomuxc 10 147 1>,

		      <&iomuxc 11 151 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>,

		      <&iomuxc 11 152 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>,

		      <&iomuxc 14 149 1>, <&iomuxc 15 154 1>, <&iomuxc 16  39 7>,

		      <&iomuxc 23  56 1>, <&iomuxc 24  61 7>, <&iomuxc 31  46 1>;

};

arch/arm/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static int gpr_set(struct task_struct *target, 
		   const void *kbuf, const void __user *ubuf)

{

	int ret;

	struct pt_regs newregs;

	struct pt_regs newregs = *task_pt_regs(target);



	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

				 &newregs,