History

drm/display: Move HDMI helpers into display-helper module

Move DRM's HMDI helpers into the display/ subdirectoy and add it to DRM's display helpers. Update all affected drivers. No functional changes. The HDMI helpers were implemented in the EDID and connector code, but are actually unrelated. With the move to the display-helper library, we can remove the dependency on drm_edid.{c,h} in some driver's HDMI source files. Several of the HDMI helpers remain in EDID code because both share parts of their implementation internally. With better refractoring of the EDID code, those HDMI helpers could be moved into the display-helper library as well. v3: * fix Kconfig dependencies (Javier) v2: * reduce HDMI helpers to avoid exporting functions (Jani) * fix include statements (Jani, Javier) * update Kconfig symbols

Thomas Zimmermann committed 4 years ago

Commit 4fc8cb41 parent 6a9909919 files · +246 −212Browse files

Unified · Split

19 files
  1. drivers/gpu/drm/Kconfig +1 −0
  2. drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 −0
  3. drivers/gpu/drm/bridge/synopsys/Kconfig +2 −0
  4. drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 −1
  5. drivers/gpu/drm/display/Kconfig +6 −0
  6. drivers/gpu/drm/display/Makefile +1 −0
  7. drivers/gpu/drm/display/drm_hdmi_helper.c +199 −0
  8. drivers/gpu/drm/drm_connector.c +0 −34
  9. drivers/gpu/drm/drm_edid.c +0 −159
  10. drivers/gpu/drm/i915/Kconfig +1 −0
  11. drivers/gpu/drm/i915/display/intel_dp.c +1 −1
  12. drivers/gpu/drm/i915/display/intel_hdmi.c +1 −0
  13. drivers/gpu/drm/i915/display/intel_lspcon.c +1 −1
  14. drivers/gpu/drm/i915/display/intel_sdvo.c +1 −0
  15. drivers/gpu/drm/vc4/Kconfig +2 −0
  16. drivers/gpu/drm/vc4/vc4_hdmi.c +1 −1
  17. include/drm/display/drm_hdmi_helper.h +27 −0
  18. include/drm/drm_connector.h +0 −3
  19. include/drm/drm_edid.h +0 −12
drivers/gpu/drm/Kconfig+1−0
@@ -246,6 +246,7 @@ config DRM_AMDGPU · 245 unmodified lines
246246 depends on DRM && PCI && MMU
247247 select FW_LOADER
248248 select DRM_DISPLAY_DP_HELPER
249+ select DRM_DISPLAY_HDMI_HELPER
249250 select DRM_DISPLAY_HELPER
250251 select DRM_KMS_HELPER
251252 select DRM_SCHED
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+1−0
@@ -74,6 +74,7 @@ · 73 unmodified lines
7474 #include <linux/component.h>
7575
7676 #include <drm/display/drm_dp_mst_helper.h>
77+#include <drm/display/drm_hdmi_helper.h>
7778 #include <drm/drm_atomic.h>
7879 #include <drm/drm_atomic_uapi.h>
7980 #include <drm/drm_atomic_helper.h>
drivers/gpu/drm/bridge/synopsys/Kconfig+2−0
@@ -1,6 +1,8 @@
11 # SPDX-License-Identifier: GPL-2.0-only
22 config DRM_DW_HDMI
33 tristate
4+ select DRM_DISPLAY_HDMI_HELPER
5+ select DRM_DISPLAY_HELPER
46 select DRM_KMS_HELPER
57 select REGMAP_MMIO
68 select CEC_CORE if CEC_NOTIFIER
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c+1−1
@@ -25,10 +25,10 @@ · 24 unmodified lines
2525 #include <uapi/linux/videodev2.h>
2626
2727 #include <drm/bridge/dw_hdmi.h>
28+#include <drm/display/drm_hdmi_helper.h>
2829 #include <drm/drm_atomic.h>
2930 #include <drm/drm_atomic_helper.h>
3031 #include <drm/drm_bridge.h>
31−#include <drm/drm_edid.h>
3232 #include <drm/drm_of.h>
3333 #include <drm/drm_print.h>
3434 #include <drm/drm_probe_helper.h>
drivers/gpu/drm/display/Kconfig+6−0
@@ -23,6 +23,12 @@ config DRM_DISPLAY_HDCP_HELPER · 22 unmodified lines
2323 help
2424 DRM display helpers for HDCP.
2525
26+config DRM_DISPLAY_HDMI_HELPER
27+ bool
28+ depends on DRM_DISPLAY_HELPER
29+ help
30+ DRM display helpers for HDMI.
31+
2632 config DRM_DP_AUX_CHARDEV
2733 bool "DRM DP AUX Interface"
2834 depends on DRM
drivers/gpu/drm/display/Makefile+1−0
@@ -8,6 +8,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o · 7 unmodified lines
88 drm_dp_mst_topology.o \
99 drm_dsc_helper.o
1010 drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o
11+drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += drm_hdmi_helper.o
1112 drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
1213 drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
1314
drivers/gpu/drm/display/drm_hdmi_helper.c+199−0
@@ -0,0 +1,199 @@
1+// SPDX-License-Identifier: MIT
2+
3+#include <linux/module.h>
4+
5+#include <drm/display/drm_hdmi_helper.h>
6+#include <drm/drm_connector.h>
7+#include <drm/drm_edid.h>
8+#include <drm/drm_modes.h>
9+#include <drm/drm_print.h>
10+#include <drm/drm_property.h>
11+
12+static inline bool is_eotf_supported(u8 output_eotf, u8 sink_eotf)
13+{
14+ return sink_eotf & BIT(output_eotf);
15+}
16+
17+/**
18+ * drm_hdmi_infoframe_set_hdr_metadata() - fill an HDMI DRM infoframe with
19+ * HDR metadata from userspace
20+ * @frame: HDMI DRM infoframe
21+ * @conn_state: Connector state containing HDR metadata
22+ *
23+ * Return: 0 on success or a negative error code on failure.
24+ */
25+int drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
26+ const struct drm_connector_state *conn_state)
27+{
28+ struct drm_connector *connector;
29+ struct hdr_output_metadata *hdr_metadata;
30+ int err;
31+
32+ if (!frame || !conn_state)
33+ return -EINVAL;
34+
35+ connector = conn_state->connector;
36+
37+ if (!conn_state->hdr_output_metadata)
38+ return -EINVAL;
39+
40+ hdr_metadata = conn_state->hdr_output_metadata->data;
41+
42+ if (!hdr_metadata || !connector)
43+ return -EINVAL;
44+
45+ /* Sink EOTF is Bit map while infoframe is absolute values */
46+ if (!is_eotf_supported(hdr_metadata->hdmi_metadata_type1.eotf,
47+ connector->hdr_sink_metadata.hdmi_type1.eotf)) {
48+ DRM_DEBUG_KMS("EOTF Not Supported\n");
49+ return -EINVAL;
50+ }
51+
52+ err = hdmi_drm_infoframe_init(frame);
53+ if (err < 0)
54+ return err;
55+
56+ frame->eotf = hdr_metadata->hdmi_metadata_type1.eotf;
57+ frame->metadata_type = hdr_metadata->hdmi_metadata_type1.metadata_type;
58+
59+ BUILD_BUG_ON(sizeof(frame->display_primaries) !=
60+ sizeof(hdr_metadata->hdmi_metadata_type1.display_primaries));
61+ BUILD_BUG_ON(sizeof(frame->white_point) !=
62+ sizeof(hdr_metadata->hdmi_metadata_type1.white_point));
63+
64+ memcpy(&frame->display_primaries,
65+ &hdr_metadata->hdmi_metadata_type1.display_primaries,
66+ sizeof(frame->display_primaries));
67+
68+ memcpy(&frame->white_point,
69+ &hdr_metadata->hdmi_metadata_type1.white_point,
70+ sizeof(frame->white_point));
71+
72+ frame->max_display_mastering_luminance =
73+ hdr_metadata->hdmi_metadata_type1.max_display_mastering_luminance;
74+ frame->min_display_mastering_luminance =
75+ hdr_metadata->hdmi_metadata_type1.min_display_mastering_luminance;
76+ frame->max_fall = hdr_metadata->hdmi_metadata_type1.max_fall;
77+ frame->max_cll = hdr_metadata->hdmi_metadata_type1.max_cll;
78+
79+ return 0;
80+}
81+EXPORT_SYMBOL(drm_hdmi_infoframe_set_hdr_metadata);
82+
83+/* HDMI Colorspace Spec Definitions */
84+#define FULL_COLORIMETRY_MASK 0x1FF
85+#define NORMAL_COLORIMETRY_MASK 0x3
86+#define EXTENDED_COLORIMETRY_MASK 0x7
87+#define EXTENDED_ACE_COLORIMETRY_MASK 0xF
88+
89+#define C(x) ((x) << 0)
90+#define EC(x) ((x) << 2)
91+#define ACE(x) ((x) << 5)
92+
93+#define HDMI_COLORIMETRY_NO_DATA 0x0
94+#define HDMI_COLORIMETRY_SMPTE_170M_YCC (C(1) | EC(0) | ACE(0))
95+#define HDMI_COLORIMETRY_BT709_YCC (C(2) | EC(0) | ACE(0))
96+#define HDMI_COLORIMETRY_XVYCC_601 (C(3) | EC(0) | ACE(0))
97+#define HDMI_COLORIMETRY_XVYCC_709 (C(3) | EC(1) | ACE(0))
98+#define HDMI_COLORIMETRY_SYCC_601 (C(3) | EC(2) | ACE(0))
99+#define HDMI_COLORIMETRY_OPYCC_601 (C(3) | EC(3) | ACE(0))
100+#define HDMI_COLORIMETRY_OPRGB (C(3) | EC(4) | ACE(0))
101+#define HDMI_COLORIMETRY_BT2020_CYCC (C(3) | EC(5) | ACE(0))
102+#define HDMI_COLORIMETRY_BT2020_RGB (C(3) | EC(6) | ACE(0))
103+#define HDMI_COLORIMETRY_BT2020_YCC (C(3) | EC(6) | ACE(0))
104+#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 (C(3) | EC(7) | ACE(0))
105+#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER (C(3) | EC(7) | ACE(1))
106+
107+static const u32 hdmi_colorimetry_val[] = {
108+ [DRM_MODE_COLORIMETRY_NO_DATA] = HDMI_COLORIMETRY_NO_DATA,
109+ [DRM_MODE_COLORIMETRY_SMPTE_170M_YCC] = HDMI_COLORIMETRY_SMPTE_170M_YCC,
110+ [DRM_MODE_COLORIMETRY_BT709_YCC] = HDMI_COLORIMETRY_BT709_YCC,
111+ [DRM_MODE_COLORIMETRY_XVYCC_601] = HDMI_COLORIMETRY_XVYCC_601,
112+ [DRM_MODE_COLORIMETRY_XVYCC_709] = HDMI_COLORIMETRY_XVYCC_709,
113+ [DRM_MODE_COLORIMETRY_SYCC_601] = HDMI_COLORIMETRY_SYCC_601,
114+ [DRM_MODE_COLORIMETRY_OPYCC_601] = HDMI_COLORIMETRY_OPYCC_601,
115+ [DRM_MODE_COLORIMETRY_OPRGB] = HDMI_COLORIMETRY_OPRGB,
116+ [DRM_MODE_COLORIMETRY_BT2020_CYCC] = HDMI_COLORIMETRY_BT2020_CYCC,
117+ [DRM_MODE_COLORIMETRY_BT2020_RGB] = HDMI_COLORIMETRY_BT2020_RGB,
118+ [DRM_MODE_COLORIMETRY_BT2020_YCC] = HDMI_COLORIMETRY_BT2020_YCC,
119+};
120+
121+#undef C
122+#undef EC
123+#undef ACE
124+
125+/**
126+ * drm_hdmi_avi_infoframe_colorimetry() - fill the HDMI AVI infoframe
127+ * colorimetry information
128+ * @frame: HDMI AVI infoframe
129+ * @conn_state: connector state
130+ */
131+void drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
132+ const struct drm_connector_state *conn_state)
133+{
134+ u32 colorimetry_val;
135+ u32 colorimetry_index = conn_state->colorspace & FULL_COLORIMETRY_MASK;
136+
137+ if (colorimetry_index >= ARRAY_SIZE(hdmi_colorimetry_val))
138+ colorimetry_val = HDMI_COLORIMETRY_NO_DATA;
139+ else
140+ colorimetry_val = hdmi_colorimetry_val[colorimetry_index];
141+
142+ frame->colorimetry = colorimetry_val & NORMAL_COLORIMETRY_MASK;
143+ /*
144+ * ToDo: Extend it for ACE formats as well. Modify the infoframe
145+ * structure and extend it in drivers/video/hdmi
146+ */
147+ frame->extended_colorimetry = (colorimetry_val >> 2) &
148+ EXTENDED_COLORIMETRY_MASK;
149+}
150+EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorimetry);
151+
152+/**
153+ * drm_hdmi_avi_infoframe_bars() - fill the HDMI AVI infoframe
154+ * bar information
155+ * @frame: HDMI AVI infoframe
156+ * @conn_state: connector state
157+ */
158+void drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,
159+ const struct drm_connector_state *conn_state)
160+{
161+ frame->right_bar = conn_state->tv.margins.right;
162+ frame->left_bar = conn_state->tv.margins.left;
163+ frame->top_bar = conn_state->tv.margins.top;
164+ frame->bottom_bar = conn_state->tv.margins.bottom;
165+}
166+EXPORT_SYMBOL(drm_hdmi_avi_infoframe_bars);
167+
168+/**
169+ * drm_hdmi_avi_infoframe_content_type() - fill the HDMI AVI infoframe
170+ * content type information, based
171+ * on correspondent DRM property.
172+ * @frame: HDMI AVI infoframe
173+ * @conn_state: DRM display connector state
174+ *
175+ */
176+void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
177+ const struct drm_connector_state *conn_state)
178+{
179+ switch (conn_state->content_type) {
180+ case DRM_MODE_CONTENT_TYPE_GRAPHICS:
181+ frame->content_type = HDMI_CONTENT_TYPE_GRAPHICS;
182+ break;
183+ case DRM_MODE_CONTENT_TYPE_CINEMA:
184+ frame->content_type = HDMI_CONTENT_TYPE_CINEMA;
185+ break;
186+ case DRM_MODE_CONTENT_TYPE_GAME:
187+ frame->content_type = HDMI_CONTENT_TYPE_GAME;
188+ break;
189+ case DRM_MODE_CONTENT_TYPE_PHOTO:
190+ frame->content_type = HDMI_CONTENT_TYPE_PHOTO;
191+ break;
192+ default:
193+ /* Graphics is the default(0) */
194+ frame->content_type = HDMI_CONTENT_TYPE_GRAPHICS;
195+ }
196+
197+ frame->itc = conn_state->content_type != DRM_MODE_CONTENT_TYPE_NO_DATA;
198+}
199+EXPORT_SYMBOL(drm_hdmi_avi_infoframe_content_type);
drivers/gpu/drm/drm_connector.c+0−34
@@ -1486,40 +1486,6 @@ int drm_connector_attach_content_type_property(struct drm_connector *connector) · 1485 unmodified lines
14861486 }
14871487 EXPORT_SYMBOL(drm_connector_attach_content_type_property);
14881488
1489−
1490−/**
1491− * drm_hdmi_avi_infoframe_content_type() - fill the HDMI AVI infoframe
1492− * content type information, based
1493− * on correspondent DRM property.
1494− * @frame: HDMI AVI infoframe
1495− * @conn_state: DRM display connector state
1496− *
1497− */
1498−void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
1499− const struct drm_connector_state *conn_state)
1500−{
1501− switch (conn_state->content_type) {
1502− case DRM_MODE_CONTENT_TYPE_GRAPHICS:
1503− frame->content_type = HDMI_CONTENT_TYPE_GRAPHICS;
1504− break;
1505− case DRM_MODE_CONTENT_TYPE_CINEMA:
1506− frame->content_type = HDMI_CONTENT_TYPE_CINEMA;
1507− break;
1508− case DRM_MODE_CONTENT_TYPE_GAME:
1509− frame->content_type = HDMI_CONTENT_TYPE_GAME;
1510− break;
1511− case DRM_MODE_CONTENT_TYPE_PHOTO:
1512− frame->content_type = HDMI_CONTENT_TYPE_PHOTO;
1513− break;
1514− default:
1515− /* Graphics is the default(0) */
1516− frame->content_type = HDMI_CONTENT_TYPE_GRAPHICS;
1517− }
1518−
1519− frame->itc = conn_state->content_type != DRM_MODE_CONTENT_TYPE_NO_DATA;
1520−}
1521−EXPORT_SYMBOL(drm_hdmi_avi_infoframe_content_type);
1522−
15231489 /**
15241490 * drm_connector_attach_tv_margin_properties - attach TV connector margin
15251491 * properties
drivers/gpu/drm/drm_edid.c+0−159
@@ -5883,78 +5883,6 @@ static bool is_hdmi2_sink(const struct drm_connector *connector) · 5882 unmodified lines
58835883 connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR420;
58845884 }
58855885
5886−static inline bool is_eotf_supported(u8 output_eotf, u8 sink_eotf)
5887−{
5888− return sink_eotf & BIT(output_eotf);
5889−}
5890−
5891−/**
5892− * drm_hdmi_infoframe_set_hdr_metadata() - fill an HDMI DRM infoframe with
5893− * HDR metadata from userspace
5894− * @frame: HDMI DRM infoframe
5895− * @conn_state: Connector state containing HDR metadata
5896− *
5897− * Return: 0 on success or a negative error code on failure.
5898− */
5899−int
5900−drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
5901− const struct drm_connector_state *conn_state)
5902−{
5903− struct drm_connector *connector;
5904− struct hdr_output_metadata *hdr_metadata;
5905− int err;
5906−
5907− if (!frame || !conn_state)
5908− return -EINVAL;
5909−
5910− connector = conn_state->connector;
5911−
5912− if (!conn_state->hdr_output_metadata)
5913− return -EINVAL;
5914−
5915− hdr_metadata = conn_state->hdr_output_metadata->data;
5916−
5917− if (!hdr_metadata || !connector)
5918− return -EINVAL;
5919−
5920− /* Sink EOTF is Bit map while infoframe is absolute values */
5921− if (!is_eotf_supported(hdr_metadata->hdmi_metadata_type1.eotf,
5922− connector->hdr_sink_metadata.hdmi_type1.eotf)) {
5923− DRM_DEBUG_KMS("EOTF Not Supported\n");
5924− return -EINVAL;
5925− }
5926−
5927− err = hdmi_drm_infoframe_init(frame);
5928− if (err < 0)
5929− return err;
5930−
5931− frame->eotf = hdr_metadata->hdmi_metadata_type1.eotf;
5932− frame->metadata_type = hdr_metadata->hdmi_metadata_type1.metadata_type;
5933−
5934− BUILD_BUG_ON(sizeof(frame->display_primaries) !=
5935− sizeof(hdr_metadata->hdmi_metadata_type1.display_primaries));
5936− BUILD_BUG_ON(sizeof(frame->white_point) !=
5937− sizeof(hdr_metadata->hdmi_metadata_type1.white_point));
5938−
5939− memcpy(&frame->display_primaries,
5940− &hdr_metadata->hdmi_metadata_type1.display_primaries,
5941− sizeof(frame->display_primaries));
5942−
5943− memcpy(&frame->white_point,
5944− &hdr_metadata->hdmi_metadata_type1.white_point,
5945− sizeof(frame->white_point));
5946−
5947− frame->max_display_mastering_luminance =
5948− hdr_metadata->hdmi_metadata_type1.max_display_mastering_luminance;
5949− frame->min_display_mastering_luminance =
5950− hdr_metadata->hdmi_metadata_type1.min_display_mastering_luminance;
5951− frame->max_fall = hdr_metadata->hdmi_metadata_type1.max_fall;
5952− frame->max_cll = hdr_metadata->hdmi_metadata_type1.max_cll;
5953−
5954− return 0;
5955−}
5956−EXPORT_SYMBOL(drm_hdmi_infoframe_set_hdr_metadata);
5957−
59585886 static u8 drm_mode_hdmi_vic(const struct drm_connector *connector,
59595887 const struct drm_display_mode *mode)
59605888 {
@@ -6076,76 +6004,6 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, · 115 unmodified lines
60766004 }
60776005 EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);
60786006
6079−/* HDMI Colorspace Spec Definitions */
6080−#define FULL_COLORIMETRY_MASK 0x1FF
6081−#define NORMAL_COLORIMETRY_MASK 0x3
6082−#define EXTENDED_COLORIMETRY_MASK 0x7
6083−#define EXTENDED_ACE_COLORIMETRY_MASK 0xF
6084−
6085−#define C(x) ((x) << 0)
6086−#define EC(x) ((x) << 2)
6087−#define ACE(x) ((x) << 5)
6088−
6089−#define HDMI_COLORIMETRY_NO_DATA 0x0
6090−#define HDMI_COLORIMETRY_SMPTE_170M_YCC (C(1) | EC(0) | ACE(0))
6091−#define HDMI_COLORIMETRY_BT709_YCC (C(2) | EC(0) | ACE(0))
6092−#define HDMI_COLORIMETRY_XVYCC_601 (C(3) | EC(0) | ACE(0))
6093−#define HDMI_COLORIMETRY_XVYCC_709 (C(3) | EC(1) | ACE(0))
6094−#define HDMI_COLORIMETRY_SYCC_601 (C(3) | EC(2) | ACE(0))
6095−#define HDMI_COLORIMETRY_OPYCC_601 (C(3) | EC(3) | ACE(0))
6096−#define HDMI_COLORIMETRY_OPRGB (C(3) | EC(4) | ACE(0))
6097−#define HDMI_COLORIMETRY_BT2020_CYCC (C(3) | EC(5) | ACE(0))
6098−#define HDMI_COLORIMETRY_BT2020_RGB (C(3) | EC(6) | ACE(0))
6099−#define HDMI_COLORIMETRY_BT2020_YCC (C(3) | EC(6) | ACE(0))
6100−#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 (C(3) | EC(7) | ACE(0))
6101−#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER (C(3) | EC(7) | ACE(1))
6102−
6103−static const u32 hdmi_colorimetry_val[] = {
6104− [DRM_MODE_COLORIMETRY_NO_DATA] = HDMI_COLORIMETRY_NO_DATA,
6105− [DRM_MODE_COLORIMETRY_SMPTE_170M_YCC] = HDMI_COLORIMETRY_SMPTE_170M_YCC,
6106− [DRM_MODE_COLORIMETRY_BT709_YCC] = HDMI_COLORIMETRY_BT709_YCC,
6107− [DRM_MODE_COLORIMETRY_XVYCC_601] = HDMI_COLORIMETRY_XVYCC_601,
6108− [DRM_MODE_COLORIMETRY_XVYCC_709] = HDMI_COLORIMETRY_XVYCC_709,
6109− [DRM_MODE_COLORIMETRY_SYCC_601] = HDMI_COLORIMETRY_SYCC_601,
6110− [DRM_MODE_COLORIMETRY_OPYCC_601] = HDMI_COLORIMETRY_OPYCC_601,
6111− [DRM_MODE_COLORIMETRY_OPRGB] = HDMI_COLORIMETRY_OPRGB,
6112− [DRM_MODE_COLORIMETRY_BT2020_CYCC] = HDMI_COLORIMETRY_BT2020_CYCC,
6113− [DRM_MODE_COLORIMETRY_BT2020_RGB] = HDMI_COLORIMETRY_BT2020_RGB,
6114− [DRM_MODE_COLORIMETRY_BT2020_YCC] = HDMI_COLORIMETRY_BT2020_YCC,
6115−};
6116−
6117−#undef C
6118−#undef EC
6119−#undef ACE
6120−
6121−/**
6122− * drm_hdmi_avi_infoframe_colorimetry() - fill the HDMI AVI infoframe
6123− * colorimetry information
6124− * @frame: HDMI AVI infoframe
6125− * @conn_state: connector state
6126− */
6127−void
6128−drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
6129− const struct drm_connector_state *conn_state)
6130−{
6131− u32 colorimetry_val;
6132− u32 colorimetry_index = conn_state->colorspace & FULL_COLORIMETRY_MASK;
6133−
6134− if (colorimetry_index >= ARRAY_SIZE(hdmi_colorimetry_val))
6135− colorimetry_val = HDMI_COLORIMETRY_NO_DATA;
6136− else
6137− colorimetry_val = hdmi_colorimetry_val[colorimetry_index];
6138−
6139− frame->colorimetry = colorimetry_val & NORMAL_COLORIMETRY_MASK;
6140− /*
6141− * ToDo: Extend it for ACE formats as well. Modify the infoframe
6142− * structure and extend it in drivers/video/hdmi
6143− */
6144− frame->extended_colorimetry = (colorimetry_val >> 2) &
6145− EXTENDED_COLORIMETRY_MASK;
6146−}
6147−EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorimetry);
6148−
61496007 /**
61506008 * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
61516009 * quantization range information
@@ -6201,23 +6059,6 @@ drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, · 49 unmodified lines
62016059 }
62026060 EXPORT_SYMBOL(drm_hdmi_avi_infoframe_quant_range);
62036061
6204−/**
6205− * drm_hdmi_avi_infoframe_bars() - fill the HDMI AVI infoframe
6206− * bar information
6207− * @frame: HDMI AVI infoframe
6208− * @conn_state: connector state
6209− */
6210−void
6211−drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,
6212− const struct drm_connector_state *conn_state)
6213−{
6214− frame->right_bar = conn_state->tv.margins.right;
6215− frame->left_bar = conn_state->tv.margins.left;
6216− frame->top_bar = conn_state->tv.margins.top;
6217− frame->bottom_bar = conn_state->tv.margins.bottom;
6218−}
6219−EXPORT_SYMBOL(drm_hdmi_avi_infoframe_bars);
6220−
62216062 static enum hdmi_3d_structure
62226063 s3d_structure_from_display_mode(const struct drm_display_mode *mode)
62236064 {
drivers/gpu/drm/i915/Kconfig+1−0
@@ -12,6 +12,7 @@ config DRM_I915 · 11 unmodified lines
1212 select TMPFS
1313 select DRM_DISPLAY_DP_HELPER
1414 select DRM_DISPLAY_HDCP_HELPER
15+ select DRM_DISPLAY_HDMI_HELPER
1516 select DRM_DISPLAY_HELPER
1617 select DRM_KMS_HELPER
1718 select DRM_PANEL
drivers/gpu/drm/i915/display/intel_dp.c+1−1
@@ -37,9 +37,9 @@ · 36 unmodified lines
3737
3838 #include <drm/display/drm_dp_helper.h>
3939 #include <drm/display/drm_dsc_helper.h>
40+#include <drm/display/drm_hdmi_helper.h>
4041 #include <drm/drm_atomic_helper.h>
4142 #include <drm/drm_crtc.h>
42−#include <drm/drm_edid.h>
4343 #include <drm/drm_probe_helper.h>
4444
4545 #include "g4x_dp.h"
drivers/gpu/drm/i915/display/intel_hdmi.c+1−0
@@ -33,6 +33,7 @@ · 32 unmodified lines
3333 #include <linux/string_helpers.h>
3434
3535 #include <drm/display/drm_hdcp_helper.h>
36+#include <drm/display/drm_hdmi_helper.h>
3637 #include <drm/drm_atomic_helper.h>
3738 #include <drm/drm_crtc.h>
3839 #include <drm/drm_edid.h>
drivers/gpu/drm/i915/display/intel_lspcon.c+1−1
@@ -24,8 +24,8 @@ · 23 unmodified lines
2424 */
2525
2626 #include <drm/display/drm_dp_dual_mode_helper.h>
27+#include <drm/display/drm_hdmi_helper.h>
2728 #include <drm/drm_atomic_helper.h>
28−#include <drm/drm_edid.h>
2929
3030 #include "intel_de.h"
3131 #include "intel_display_types.h"
drivers/gpu/drm/i915/display/intel_sdvo.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include <linux/i2c.h>
3232 #include <linux/slab.h>
3333
34+#include <drm/display/drm_hdmi_helper.h>
3435 #include <drm/drm_atomic_helper.h>
3536 #include <drm/drm_crtc.h>
3637 #include <drm/drm_edid.h>
drivers/gpu/drm/vc4/Kconfig+2−0
@@ -5,6 +5,8 @@ config DRM_VC4 · 4 unmodified lines
55 depends on DRM
66 depends on SND && SND_SOC
77 depends on COMMON_CLK
8+ select DRM_DISPLAY_HDMI_HELPER
9+ select DRM_DISPLAY_HELPER
810 select DRM_KMS_HELPER
911 select DRM_GEM_CMA_HELPER
1012 select DRM_PANEL_BRIDGE
drivers/gpu/drm/vc4/vc4_hdmi.c+1−1
@@ -31,8 +31,8 @@ · 30 unmodified lines
3131 * encoder block has CEC support.
3232 */
3333
34+#include <drm/display/drm_hdmi_helper.h>
3435 #include <drm/drm_atomic_helper.h>
35−#include <drm/drm_edid.h>
3636 #include <drm/drm_probe_helper.h>
3737 #include <drm/drm_simple_kms_helper.h>
3838 #include <drm/drm_scdc_helper.h>
include/drm/display/drm_hdmi_helper.h+27−0
@@ -0,0 +1,27 @@
1+/* SPDX-License-Identifier: MIT */
2+
3+#ifndef DRM_HDMI_HELPER
4+#define DRM_HDMI_HELPER
5+
6+#include <linux/hdmi.h>
7+
8+struct drm_connector;
9+struct drm_connector_state;
10+struct drm_display_mode;
11+
12+void
13+drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
14+ const struct drm_connector_state *conn_state);
15+
16+void
17+drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,
18+ const struct drm_connector_state *conn_state);
19+
20+int
21+drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
22+ const struct drm_connector_state *conn_state);
23+
24+void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
25+ const struct drm_connector_state *conn_state);
26+
27+#endif
include/drm/drm_connector.h+0−3
@@ -1784,9 +1784,6 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev); · 1783 unmodified lines
17841784 int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector);
17851785 int drm_mode_create_dp_colorspace_property(struct drm_connector *connector);
17861786 int drm_mode_create_content_type_property(struct drm_device *dev);
1787−void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
1788− const struct drm_connector_state *conn_state);
1789−
17901787 int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
17911788
17921789 int drm_connector_set_path_property(struct drm_connector *connector,
include/drm/drm_edid.h+0−12
@@ -400,24 +400,12 @@ drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, · 399 unmodified lines
400400 const struct drm_connector *connector,
401401 const struct drm_display_mode *mode);
402402
403−void
404−drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
405− const struct drm_connector_state *conn_state);
406−
407−void
408−drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,
409− const struct drm_connector_state *conn_state);
410−
411403 void
412404 drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
413405 const struct drm_connector *connector,
414406 const struct drm_display_mode *mode,
415407 enum hdmi_quantization_range rgb_quant_range);
416408
417−int
418−drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
419− const struct drm_connector_state *conn_state);
420−
421409 /**
422410 * drm_eld_mnl - Get ELD monitor name length in bytes.
423411 * @eld: pointer to an eld memory structure with mnl set

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t