tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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: Hans Verkuil <hansverk@cisco.com>
Cc: stable@vger.kernel.org
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab 463659a0 db034018

+10 -10
+2 -2
drivers/media/i2c/adv7511.c
··· 1357 1357 switch (format->format.colorspace) { 1358 1358 case V4L2_COLORSPACE_OPRGB: 1359 1359 c = HDMI_COLORIMETRY_EXTENDED; 1360 - ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 : 1361 - HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB; 1360 + ec = y ? HDMI_EXTENDED_COLORIMETRY_OPYCC_601 : 1361 + HDMI_EXTENDED_COLORIMETRY_OPRGB; 1362 1362 break; 1363 1363 case V4L2_COLORSPACE_SMPTE170M: 1364 1364 c = y ? HDMI_COLORIMETRY_ITU_601 : HDMI_COLORIMETRY_NONE;
+2 -2
drivers/media/v4l2-core/v4l2-dv-timings.c
··· 877 877 switch (avi->colorimetry) { 878 878 case HDMI_COLORIMETRY_EXTENDED: 879 879 switch (avi->extended_colorimetry) { 880 - case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: 880 + case HDMI_EXTENDED_COLORIMETRY_OPRGB: 881 881 c.colorspace = V4L2_COLORSPACE_OPRGB; 882 882 c.xfer_func = V4L2_XFER_FUNC_OPRGB; 883 883 break; ··· 948 948 c.ycbcr_enc = V4L2_YCBCR_ENC_601; 949 949 c.xfer_func = V4L2_XFER_FUNC_SRGB; 950 950 break; 951 - case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: 951 + case HDMI_EXTENDED_COLORIMETRY_OPYCC_601: 952 952 c.colorspace = V4L2_COLORSPACE_OPRGB; 953 953 c.ycbcr_enc = V4L2_YCBCR_ENC_601; 954 954 c.xfer_func = V4L2_XFER_FUNC_OPRGB;
+4 -4
drivers/video/hdmi.c
··· 592 592 return "xvYCC 709"; 593 593 case HDMI_EXTENDED_COLORIMETRY_S_YCC_601: 594 594 return "sYCC 601"; 595 - case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: 596 - return "Adobe YCC 601"; 597 - case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: 598 - return "Adobe RGB"; 595 + case HDMI_EXTENDED_COLORIMETRY_OPYCC_601: 596 + return "opYCC 601"; 597 + case HDMI_EXTENDED_COLORIMETRY_OPRGB: 598 + return "opRGB"; 599 599 case HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM: 600 600 return "BT.2020 Constant Luminance"; 601 601 case HDMI_EXTENDED_COLORIMETRY_BT2020:
+2 -2
include/linux/hdmi.h
··· 101 101 HDMI_EXTENDED_COLORIMETRY_XV_YCC_601, 102 102 HDMI_EXTENDED_COLORIMETRY_XV_YCC_709, 103 103 HDMI_EXTENDED_COLORIMETRY_S_YCC_601, 104 - HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601, 105 - HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB, 104 + HDMI_EXTENDED_COLORIMETRY_OPYCC_601, 105 + HDMI_EXTENDED_COLORIMETRY_OPRGB, 106 106 107 107 /* The following EC values are only defined in CEA-861-F. */ 108 108 HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,