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

Commit 0455ac9d authored by Todd Kjos's avatar Todd Kjos
Browse files

Merge branch 'upstream-linux-4.9.y' into android-4.9

parents 5ab69b4e ae7d4319

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 = 11

SUBLEVEL = 12

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/lib/getuser.S

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ ENTRY(__get_user_4) 
ENDPROC(__get_user_4)



ENTRY(__get_user_8)

	check_uaccess r0, 8, r1, r2, __get_user_bad

	check_uaccess r0, 8, r1, r2, __get_user_bad8

#ifdef CONFIG_THUMB2_KERNEL

5: TUSER(ldr)	r2, [r0]

6: TUSER(ldr)	r3, [r0, #4]

arch/powerpc/mm/init_64.c

+2 −1
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ early_param("disable_radix", parse_disable_radix); 
void __init mmu_early_init_devtree(void)

{

	/* Disable radix mode based on kernel command line. */

	if (disable_radix)

	/* We don't yet have the machinery to do radix as a guest. */

	if (disable_radix || !(mfmsr() & MSR_HV))

		cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX;



	if (early_radix_enabled())

drivers/gpu/drm/drm_dp_mst_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) 
				mgr->payloads[i].vcpi = req_payload.vcpi;

			} else if (mgr->payloads[i].num_slots) {

				mgr->payloads[i].num_slots = 0;

				drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]);

				drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]);

				req_payload.payload_state = mgr->payloads[i].payload_state;

				mgr->payloads[i].start_slot = 0;

			}