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

Commit 3f7987f8 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: hdmi.h: rename ADOBE_RGB to OPRGB and ADOBE_YCC to OPYCC 



commit 463659a08d7999d5461fa45b35b17686189a70ca upstream.

These names have been renamed in the CTA-861 standard due to trademark
issues. Replace them here as well so they are in sync with the standard.

Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1452c51

drivers/media/i2c/adv7511.c

+2 −2
Original line number Diff line number Diff line
@@ -1357,8 +1357,8 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, 
	switch (format->format.colorspace) {

	case V4L2_COLORSPACE_OPRGB:

		c = HDMI_COLORIMETRY_EXTENDED;

		ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 :

			 HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB;

		ec = y ? HDMI_EXTENDED_COLORIMETRY_OPYCC_601 :

			 HDMI_EXTENDED_COLORIMETRY_OPRGB;

		break;

	case V4L2_COLORSPACE_SMPTE170M:

		c = y ? HDMI_COLORIMETRY_ITU_601 : HDMI_COLORIMETRY_NONE;

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

+2 −2
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, 
		switch (avi->colorimetry) {

		case HDMI_COLORIMETRY_EXTENDED:

			switch (avi->extended_colorimetry) {

			case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB:

			case HDMI_EXTENDED_COLORIMETRY_OPRGB:

				c.colorspace = V4L2_COLORSPACE_OPRGB;

				c.xfer_func = V4L2_XFER_FUNC_OPRGB;

				break;
@@ -908,7 +908,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, 
				c.ycbcr_enc = V4L2_YCBCR_ENC_601;

				c.xfer_func = V4L2_XFER_FUNC_SRGB;

				break;

			case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601:

			case HDMI_EXTENDED_COLORIMETRY_OPYCC_601:

				c.colorspace = V4L2_COLORSPACE_OPRGB;

				c.ycbcr_enc = V4L2_YCBCR_ENC_601;

				c.xfer_func = V4L2_XFER_FUNC_OPRGB;

drivers/video/hdmi.c

+4 −4
Original line number Diff line number Diff line
@@ -592,10 +592,10 @@ hdmi_extended_colorimetry_get_name(enum hdmi_extended_colorimetry ext_col) 
		return "xvYCC 709";

	case HDMI_EXTENDED_COLORIMETRY_S_YCC_601:

		return "sYCC 601";

	case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601:

		return "Adobe YCC 601";

	case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB:

		return "Adobe RGB";

	case HDMI_EXTENDED_COLORIMETRY_OPYCC_601:

		return "opYCC 601";

	case HDMI_EXTENDED_COLORIMETRY_OPRGB:

		return "opRGB";

	case HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM:

		return "BT.2020 Constant Luminance";

	case HDMI_EXTENDED_COLORIMETRY_BT2020:

include/linux/hdmi.h

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ enum hdmi_extended_colorimetry { 
	HDMI_EXTENDED_COLORIMETRY_XV_YCC_601,

	HDMI_EXTENDED_COLORIMETRY_XV_YCC_709,

	HDMI_EXTENDED_COLORIMETRY_S_YCC_601,

	HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,

	HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,

	HDMI_EXTENDED_COLORIMETRY_OPYCC_601,

	HDMI_EXTENDED_COLORIMETRY_OPRGB,



	/* The following EC values are only defined in CEA-861-F. */

	HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,