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

Showing the changes to include (3 of 19 files). Show all

Unified · Split

3 files
  1. include/drm/display/drm_hdmi_helper.h +27 −0
  2. include/drm/drm_connector.h +0 −3
  3. include/drm/drm_edid.h +0 −12
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