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

Commit 2a7dab42 authored by Ashwini Muduganti's avatar Ashwini Muduganti
Browse files

Merge commit 'refs/changes/70/2513370/1' of ssh://git.quicinc.com:29418/kernel/msm-4.14 



Change-Id: I36282798b8379c709ec007d9327eb495257c9641
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>
parents 33f795b2 ce2f7fef

Documentation/media/uapi/v4l/biblio.rst

+0 −10
Original line number Diff line number Diff line
@@ -226,16 +226,6 @@ xvYCC 


:author:    International Electrotechnical Commission (http://www.iec.ch)



.. _adobergb:



AdobeRGB

========





:title:     Adobe© RGB (1998) Color Image Encoding Version 2005-05



:author:    Adobe Systems Incorporated (http://www.adobe.com)



.. _oprgb:



opRGB

Documentation/media/uapi/v4l/colorspaces-defs.rst

+4 −4
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum 
      - See :ref:`col-rec709`.

    * - ``V4L2_COLORSPACE_SRGB``

      - See :ref:`col-srgb`.

    * - ``V4L2_COLORSPACE_ADOBERGB``

      - See :ref:`col-adobergb`.

    * - ``V4L2_COLORSPACE_OPRGB``

      - See :ref:`col-oprgb`.

    * - ``V4L2_COLORSPACE_BT2020``

      - See :ref:`col-bt2020`.

    * - ``V4L2_COLORSPACE_DCI_P3``
@@ -90,8 +90,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum 
      - Use the Rec. 709 transfer function.

    * - ``V4L2_XFER_FUNC_SRGB``

      - Use the sRGB transfer function.

    * - ``V4L2_XFER_FUNC_ADOBERGB``

      - Use the AdobeRGB transfer function.

    * - ``V4L2_XFER_FUNC_OPRGB``

      - Use the opRGB transfer function.

    * - ``V4L2_XFER_FUNC_SMPTE240M``

      - Use the SMPTE 240M transfer function.

    * - ``V4L2_XFER_FUNC_NONE``

Documentation/media/uapi/v4l/colorspaces-details.rst

+6 −7
Original line number Diff line number Diff line
@@ -290,15 +290,14 @@ Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range 
170M/BT.601. The Y'CbCr quantization is limited range.





.. _col-adobergb:

.. _col-oprgb:



Colorspace Adobe RGB (V4L2_COLORSPACE_ADOBERGB)

Colorspace opRGB (V4L2_COLORSPACE_OPRGB)

===============================================



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

The :ref:`oprgb` standard defines the colorspace used by computer

graphics that use the opRGB colorspace. The default transfer function is

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

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

range.
@@ -312,7 +311,7 @@ The chromaticities of the primary colors and the white reference are: 


.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|



.. flat-table:: Adobe RGB Chromaticities

.. flat-table:: opRGB Chromaticities

    :header-rows:  1

    :stub-columns: 0

    :widths:       1 1 2

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 80

SUBLEVEL = 81

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ 
				ti,hwmods = "pcie1";

				phys = <&pcie1_phy>;

				phy-names = "pcie-phy0";

				ti,syscon-unaligned-access = <&scm_conf1 0x14 2>;

				ti,syscon-unaligned-access = <&scm_conf1 0x14 1>;

				status = "disabled";

			};

		};